Refactor UI assets and harden quality checks

karldns/routers/assets.py

@@ -5,31 +5,11 @@ from pathlib import Path
 from fastapi import APIRouter, Response
 from fastapi.responses import FileResponse, RedirectResponse
 
-from ..web.scripts import ADMIN_TABLES_JS, CLIPBOARD_JS, THEME_JS, VISITOR_IP_JS
-from ..web.styles import ADMIN_CSS, BASE_CSS
-
 ASSET_DIR = Path(__file__).parents[1] / "assets"
 router = APIRouter(include_in_schema=False)
 ASSET_CACHE_HEADERS = {"Cache-Control": "public, max-age=31536000, immutable"}
 
 
-def _minify_css(css: str) -> str:
-    return (
-        " ".join(css.split())
-        .replace(" {", "{")
-        .replace("{ ", "{")
-        .replace("; ", ";")
-        .replace(": ", ":")
-        .replace(", ", ",")
-        .replace(" }", "}")
-        .replace(";}", "}")
-    )
-
-
-MINIFIED_BASE_CSS = _minify_css(BASE_CSS)
-MINIFIED_ADMIN_CSS = _minify_css(ADMIN_CSS)
-
-
 @router.get("/favicon.ico")
 def favicon() -> FileResponse:
     return FileResponse(ASSET_DIR / "favicon.ico", media_type="image/x-icon", headers=ASSET_CACHE_HEADERS)
@@ -115,33 +95,33 @@ def site_webmanifest() -> Response:
 
 
 @router.get("/theme.js")
-def theme_js() -> Response:
-    return Response(THEME_JS, media_type="application/javascript", headers=ASSET_CACHE_HEADERS)
+def theme_js() -> FileResponse:
+    return FileResponse(ASSET_DIR / "theme.js", media_type="application/javascript", headers=ASSET_CACHE_HEADERS)
 
 
 @router.get("/clipboard.js")
-def clipboard_js() -> Response:
-    return Response(CLIPBOARD_JS, media_type="application/javascript", headers=ASSET_CACHE_HEADERS)
+def clipboard_js() -> FileResponse:
+    return FileResponse(ASSET_DIR / "clipboard.js", media_type="application/javascript", headers=ASSET_CACHE_HEADERS)
 
 
 @router.get("/admin-tables.js")
-def admin_tables_js() -> Response:
-    return Response(ADMIN_TABLES_JS, media_type="application/javascript", headers=ASSET_CACHE_HEADERS)
+def admin_tables_js() -> FileResponse:
+    return FileResponse(ASSET_DIR / "admin-tables.js", media_type="application/javascript", headers=ASSET_CACHE_HEADERS)
 
 
 @router.get("/visitor-ip.js")
-def visitor_ip_js() -> Response:
-    return Response(VISITOR_IP_JS, media_type="application/javascript", headers=ASSET_CACHE_HEADERS)
+def visitor_ip_js() -> FileResponse:
+    return FileResponse(ASSET_DIR / "visitor-ip.js", media_type="application/javascript", headers=ASSET_CACHE_HEADERS)
 
 
 @router.get("/app.css")
-def app_css() -> Response:
-    return Response(MINIFIED_BASE_CSS, media_type="text/css", headers=ASSET_CACHE_HEADERS)
+def app_css() -> FileResponse:
+    return FileResponse(ASSET_DIR / "app.css", media_type="text/css", headers=ASSET_CACHE_HEADERS)
 
 
 @router.get("/admin.css")
-def admin_css() -> Response:
-    return Response(MINIFIED_ADMIN_CSS, media_type="text/css", headers=ASSET_CACHE_HEADERS)
+def admin_css() -> FileResponse:
+    return FileResponse(ASSET_DIR / "admin.css", media_type="text/css", headers=ASSET_CACHE_HEADERS)
 
 
 @router.get("/install.sh")