From c5c5e2825f323dccf46c854a592704adc57a8a33 Mon Sep 17 00:00:00 2001 From: hay-kot Date: Thu, 11 Feb 2021 20:47:35 -0900 Subject: [PATCH] remove static files from FastAPI --- mealie/app.py | 44 ++++++++++++---------------------- mealie/routes/static_routes.py | 24 ------------------- 2 files changed, 15 insertions(+), 53 deletions(-) delete mode 100644 mealie/routes/static_routes.py diff --git a/mealie/app.py b/mealie/app.py index d90fcc6c8..fd96e6b3d 100644 --- a/mealie/app.py +++ b/mealie/app.py @@ -1,14 +1,22 @@ import uvicorn from fastapi import FastAPI -from fastapi.staticfiles import StaticFiles # import utils.startup as startup -from app_config import (APP_VERSION, PORT, PRODUCTION, WEB_PATH, docs_url, - redoc_url) -from routes import (backup_routes, debug_routes, meal_routes, migration_routes, - setting_routes, static_routes, theme_routes) -from routes.recipe import (all_recipe_routes, category_routes, - recipe_crud_routes, tag_routes) +from app_config import APP_VERSION, PORT, WEB_PATH, docs_url, redoc_url +from routes import ( + backup_routes, + debug_routes, + meal_routes, + migration_routes, + setting_routes, + theme_routes, +) +from routes.recipe import ( + all_recipe_routes, + category_routes, + recipe_crud_routes, + tag_routes, +) from services.settings_services import default_settings_init from utils.logger import logger @@ -21,10 +29,6 @@ app = FastAPI( ) -def mount_static_files(): - app.mount("/static", StaticFiles(directory=WEB_PATH, html=True)) - - def start_scheduler(): import services.scheduler.scheduled_jobs @@ -52,25 +56,7 @@ def api_routers(): app.include_router(debug_routes.router) -if PRODUCTION: - pass - # mount_static_files() - api_routers() - -# API 404 Catch all CALL AFTER ROUTERS -@app.get("/api/{full_path:path}", status_code=404, include_in_schema=False) -def invalid_api(): - return None - - -app.include_router(static_routes.router) - - -# Generate API Documentation -# if not PRODUCTION: -# generate_api_docs(app) - start_scheduler() init_settings() diff --git a/mealie/routes/static_routes.py b/mealie/routes/static_routes.py deleted file mode 100644 index 52d2fa9fe..000000000 --- a/mealie/routes/static_routes.py +++ /dev/null @@ -1,24 +0,0 @@ -from pathlib import Path - -from fastapi import APIRouter, responses -from fastapi.responses import FileResponse - -CWD = Path(__file__).parent -WEB_PATH = CWD.parent.joinpath("dist") -BASE_HTML = WEB_PATH.joinpath("index.html") -router = APIRouter(include_in_schema=False) - - -@router.get("/favicon.ico") -def facivon(): - return responses.RedirectResponse(url="/mealie/favicon.ico") - - -@router.get("/") -async def root(): - return FileResponse(BASE_HTML) - - -@router.get("/{full_path:path}") -async def root_plus(full_path): - return FileResponse(BASE_HTML)