Consolidated FE hosting to FastAPI for now

Dockerfile

@@ -11,32 +11,17 @@ RUN npm run build
 # Use Python image with uv pre-installed and nginx
 FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim
 
-RUN apt-get update && apt-get install -y nginx
-
 WORKDIR /app
 
-
 # Install backend dependencies and make pytest available
 COPY backend/ backend/
 COPY pyproject.toml .
 RUN uv sync && uv pip install .
-ENV PATH="/root/.local/bin:/root/.uv/venv/bin:${PATH}"
-
-# Set up frontend
-COPY --from=frontend-builder /app/frontend/build /usr/share/nginx/html
-COPY frontend/nginx.conf /etc/nginx/conf.d/default.conf
-
-# Add uv's bin directory to PATH
 ENV PATH="/app/.venv/bin:/root/.local/bin:/root/.uv/venv/bin:${PATH}" 
 
-EXPOSE 80 8000
-
-# Set up nginx confgi
-RUN mkdir -p /var/lib/nginx/body /var/cache/nginx
-RUN chmod -R 777 /var/lib/nginx /var/cache/nginx
-RUN chmod -R 755 /app/.venv
+# Set up frontend
+COPY --from=frontend-builder /app/frontend/build /app/static
 
-COPY start.sh /start.sh
-RUN chmod +x /start.sh
+EXPOSE 80
 
-CMD ["/start.sh"]
+CMD ["uvicorn", "backend.app.main:app", "--host", "0.0.0.0", "--port", "80"] 

Dockerfile.test

@@ -1,11 +1,12 @@
 # Use Node.js image for frontend
-FROM node:20-slim AS frontend
+FROM node:20-slim AS frontend-builder
 
 WORKDIR /app/frontend
 COPY frontend/package*.json ./
 RUN npm install --legacy-peer-deps
 
 COPY frontend/ ./
+RUN npm run build
 
 # Use Python image with uv pre-installed
 FROM ghcr.io/astral-sh/uv:python3.12-bookworm-slim
@@ -21,13 +22,9 @@ WORKDIR /app
 # Copy backend code
 COPY backend/ backend/
 COPY pyproject.toml .
-
-# Install backend dependencies and pytest
-RUN uv sync && uv pip install pytest && uv pip install .
-ENV PATH="/root/.local/bin:/root/.uv/venv/bin:${PATH}"
+RUN uv sync && uv pip install .
+ENV PATH="/app/.venv/bin:/root/.local/bin:/root/.uv/venv/bin:${PATH}" 
 
 # Copy frontend from builder
-COPY --from=frontend /app/frontend /app/frontend
-
-# Add uv's bin directory to PATH
-ENV PATH="/app/.venv/bin:/root/.local/bin:/root/.uv/venv/bin:${PATH}" 
+COPY --from=frontend-builder /app/frontend /app/frontend
+COPY --from=frontend-builder /app/frontend/build /app/static

backend/app/main.py

@@ -1,5 +1,7 @@
-from fastapi import FastAPI
+from fastapi import FastAPI, HTTPException
+from fastapi.staticfiles import StaticFiles
 from fastapi.middleware.cors import CORSMiddleware
+from fastapi.responses import FileResponse
 from pydantic import BaseModel
 from backend.app.problem_generator import ProblemGenerator
 
@@ -19,12 +21,30 @@ class UrlInput(BaseModel):
 class UserQuery(BaseModel):
     user_query: str
 
-@app.post("/crawl/")
+@app.post("/api/crawl/")
 async def crawl_documentation(input_data: UrlInput):
     print(f"Received url {input_data.url}")
     return {"status": "received"}
 
-@app.post("/problems/")
+@app.post("/api/problems/")
 async def generate_problems(query: UserQuery):
     problems = ProblemGenerator().generate_problems(query.user_query)
-    return {"Problems": problems} 
+    return {"Problems": problems}
+
+# Serve static files
+app.mount("/static", StaticFiles(directory="/app/static/static"), name="static")
+
+# Root path handler
+@app.get("/")
+async def serve_root():
+    return FileResponse("/app/static/index.html")
+
+# Catch-all route for serving index.html
+@app.get("/{full_path:path}")
+async def serve_react(full_path: str):
+    # Skip API routes
+    if full_path.startswith("api/"):
+        raise HTTPException(status_code=404, detail="Not found")
+    
+    # For all other routes, serve the React index.html
+    return FileResponse("/app/static/index.html") 

run_local.sh

@@ -12,6 +12,7 @@ docker build -t simplify .
 # Run the container
 echo "Starting container..."
 docker run -d \
+    --env-file .env \
     --name simplify \
     -p 80:80 \
     -p 8000:8000 \

start.sh

@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# Load environment variables from .env
-set -a
-source .env
-set +a
-
-# Start nginx
-nginx
-
-# Start the FastAPI application
-uvicorn backend.app.main:app --host 0.0.0.0 --port 8000