fix main

backend/main.py

@@ -1,9 +1,9 @@
 import os
-from fastapi import FastAPI, APIRouter, Request, Response
+from pathlib import Path
+from fastapi import FastAPI, APIRouter, Request
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.staticfiles import StaticFiles
 from fastapi.responses import FileResponse
-from pathlib import Path
 import logging
 
 from database.database import engine
@@ -15,28 +15,40 @@ from api.assessment_routes import router as assessment_router
 from api.application_routes import router as application_router
 from config import settings
 
-# Logging config
+# ----------------------------
+# Logging configuration
+# ----------------------------
 logging.basicConfig(level=settings.log_level)
 logger = logging.getLogger(__name__)
 
-# Env
+# ----------------------------
+# Environment variables
+# ----------------------------
 PORT = int(os.environ.get("PORT", 7860))
 HOST = os.environ.get("HOST", "0.0.0.0")
+DEBUG = os.getenv("DEBUG", str(settings.debug)).lower() == "true"
 
+# ----------------------------
+# Initialize FastAPI
+# ----------------------------
 app = FastAPI(
     title=settings.app_name,
     description=settings.app_description,
     version=settings.app_version
 )
 
-# DB tables
+# ----------------------------
+# Create database tables on startup
+# ----------------------------
 @app.on_event("startup")
 def startup_event():
     Base.metadata.create_all(bind=engine)
     logger.info(f"Database tables created/verified at {settings.database_url}")
 
-# CORS
-origins = os.getenv("CORS_ORIGINS", "").split(",")
+# ----------------------------
+# Configure CORS
+# ----------------------------
+origins = os.getenv("CORS_ORIGINS", "http://localhost:5173,http://localhost:3000").split(",")
 app.add_middleware(
     CORSMiddleware,
     allow_origins=[o.strip() for o in origins if o.strip()],
@@ -45,7 +57,9 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-# API routes
+# ----------------------------
+# API routers under /api
+# ----------------------------
 api_router = APIRouter(prefix="/api")
 api_router.include_router(root_router)
 api_router.include_router(user_router)
@@ -54,36 +68,48 @@ api_router.include_router(assessment_router)
 api_router.include_router(application_router)
 app.include_router(api_router)
 
-# Serve static build files (assets + config.js + index.html)
-app.mount(
-    "/",
-    StaticFiles(directory="static", html=False),  # no html=True here
-    name="static",
-)
+# ----------------------------
+# Mount React static files
+# ----------------------------
+react_build_path = Path("static")
+if react_build_path.exists():
+    # Serve actual static files (JS/CSS/images)
+    app.mount("/static", StaticFiles(directory=react_build_path / "assets"), name="static_assets")
+    # Serve index.html at root
+    app.mount("/", StaticFiles(directory=react_build_path, html=True), name="react_root")
+else:
+    logger.warning("React build not found in /static. Make sure to build frontend.")
 
-# Custom fallback for SPA routes
+# ----------------------------
+# SPA fallback for non-API routes
+# ----------------------------
 @app.get("/{full_path:path}")
 async def serve_spa(full_path: str, request: Request):
-    # If it's an API route, let FastAPI handle a 404 properly
+    """
+    Serve React SPA for any non-API path that doesn't match a real file.
+    """
     if request.url.path.startswith("/api"):
         return {"detail": "API route not found."}
 
-    # Try to serve the exact file if it exists
-    file_path = Path("static") / full_path
-
-    if file_path.is_file():
-        # Let StaticFiles serve it
-        return FileResponse(file_path)
-
-    # Fallback: serve index.html (SPA)
-    index_file = Path("static") / "index.html"
+    index_file = react_build_path / "index.html"
     if index_file.exists():
         return FileResponse(index_file)
-
+    
     return {"detail": "SPA not found, build your frontend first."}
 
 logger.info("Application routes registered")
 
+# ----------------------------
+# Run server (local/dev)
+# ----------------------------
 if __name__ == "__main__":
     import uvicorn
-    uvicorn.run("main:app", host=HOST, port=PORT, log_level="info", workers=1)
+    logger.info(f"Starting server on {HOST}:{PORT}")
+    uvicorn.run(
+        "main:app",
+        host=HOST,
+        port=PORT,
+        log_level="info",
+        workers=1,
+        loop="asyncio",
+    )