update

Dockerfile

@@ -51,8 +51,8 @@ COPY --from=python-deps /usr/local/bin /usr/local/bin
 # Copy backend application code
 COPY metsa-backend/ ./
 
-# Copy built frontend files from the builder stage to static directory
-COPY --from=frontend-builder /app/frontend/out ./static
+# Copy built frontend files from the builder stage to the expected location
+COPY --from=frontend-builder /app/frontend/out ./metsa-frontend/out
 
 # Create uploads directory structure
 RUN mkdir -p uploads/commercial \
@@ -64,7 +64,7 @@ ENV PORT=8000
 ENV APP_NAME="Document Portal API"
 ENV APP_VERSION="1.0.0"
 ENV DEBUG=True
-ENV MONGODB_URL=mongodb://localhost:27017
+ENV MONGODB_URL=mongodb+srv://lawyerlit11:3uN39xD2C2lGiMyY@cluster0.rqm6zmq.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0
 ENV DATABASE_NAME=document_portal
 ENV SECRET_KEY=your-secret-key-here-change-in-production
 ENV ALGORITHM=HS256

README-Docker.md

@@ -1,46 +0,0 @@
-# Metsa App - Docker Setup
-
-This repository runs the Next.js frontend and FastAPI backend together using a single container image (with docker-compose for convenience).
-
-## Prerequisites
-- Docker 24+
-- Docker Compose plugin (`docker compose`) or Docker Desktop
-- Make (optional; Windows users can use Git Bash or WSL)
-
-## Quick start
-
-```bash
-# Build image
-make build
-# Start
-make up
-# Tail logs
-make logs
-# Stop
-make down
-```
-
-Without Make:
-```bash
-docker compose build
-docker compose up -d
-docker compose logs -f --tail=200
-```
-
-App URLs:
-- Frontend: http://localhost:3000
-- Backend:  http://localhost:8000 (FastAPI docs: http://localhost:8000/docs)
-
-## How it works
-- Multi-stage Dockerfile builds the Next.js app, then runs both the built Next app and the FastAPI server in the final runtime image.
-- A small start.sh launches the backend (Uvicorn) in background and then starts Next.js.
-- docker-compose exposes ports 3000 and 8000 and mounts `metsa-backend/uploads` so files persist across restarts.
-
-## Customizing
-- Frontend API base URL can be overridden via NEXT_PUBLIC_API_URL (defaults to http://localhost:8000/api/v1).
-- For production, set proper environment variables in docker-compose.yml and secure the backend settings.
-
-## Notes
-- This single-container approach is simple for development and small deployments. For production, consider separate services and a reverse proxy.
-- Ensure MongoDB is reachable by the backend. Update `metsa-backend/app/config.py` MONGODB_URL or use an external MongoDB service/container.
-

docker-compose.yml

@@ -1,43 +0,0 @@
-version: '3.8'
-
-services:
-  app:
-    build:
-      context: .
-      dockerfile: Dockerfile
-    ports:
-      - "8000:8000"
-    environment:
-      - NODE_ENV=production
-      - NEXT_PUBLIC_API_URL=http://localhost:8000/api/v1
-      - DATABASE_URL=mongodb://mongo:27017/metsa
-      - SECRET_KEY=your-secret-key-change-in-production
-      - ALGORITHM=HS256
-      - ACCESS_TOKEN_EXPIRE_MINUTES=30
-    volumes:
-      - ./metsa-backend/uploads:/app/metsa-backend/uploads
-      - ./metsa-backend/.env:/app/metsa-backend/.env
-    depends_on:
-      - mongo
-    networks:
-      - metsa-network
-
-  mongo:
-    image: mongo:7.0
-    ports:
-      - "27017:27017"
-    volumes:
-      - mongo-data:/data/db
-    environment:
-      - MONGO_INITDB_ROOT_USERNAME=admin
-      - MONGO_INITDB_ROOT_PASSWORD=admin123
-      - MONGO_INITDB_DATABASE=metsa
-    networks:
-      - metsa-network
-
-volumes:
-  mongo-data:
-
-networks:
-  metsa-network:
-    driver: bridge

metsa-backend/.env.example

@@ -1,25 +0,0 @@
-# Application
-APP_NAME="Document Portal API"
-APP_VERSION="1.0.0"
-DEBUG=True
-
-# MongoDB
-MONGODB_URL=mongodb://localhost:27017
-DATABASE_NAME=document_portal
-
-# Security
-SECRET_KEY=your-secret-key-here-change-in-production
-ALGORITHM=HS256
-ACCESS_TOKEN_EXPIRE_MINUTES=1440
-
-# Email
-SMTP_HOST=smtp.gmail.com
-SMTP_PORT=587
-SMTP_USER=your-email@gmail.com
-SMTP_PASSWORD=your-app-password
-EMAILS_FROM_EMAIL=noreply@metsa.com
-EMAILS_FROM_NAME=Metsa Document Portal
-
-# File Upload
-UPLOAD_DIR=uploads
-MAX_FILE_SIZE=10485760

metsa-backend/app/config.py

@@ -9,7 +9,7 @@ class Settings(BaseModel):
     BASE_URL: str = "http://localhost:8000"
     
     # MongoDB
-    MONGODB_URL: str = "mongodb://localhost:27017"
+    MONGODB_URL: str = "mongodb+srv://lawyerlit11:3uN39xD2C2lGiMyY@cluster0.rqm6zmq.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0"
     DATABASE_NAME: str = "document_portal"
     
     # Security

metsa-backend/app/main.py

@@ -61,47 +61,56 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
-# Include routers
+# Include routers (API routes)
 app.include_router(auth.router, prefix="/api/v1")
 app.include_router(users.router, prefix="/api/v1")
 app.include_router(documents.router, prefix="/api/v1")
 app.include_router(notifications.router, prefix="/api/v1")
 
+# Health check endpoint (before catch-all)
+@app.get("/health")
+async def health_check():
+    return {"status": "healthy"}
+
+# Serve Next.js static export (built assets)
+FRONTEND_DIR = Path(__file__).resolve().parents[1] / "metsa-frontend" / "out"
+INDEX_FILE = FRONTEND_DIR / "index.html"
+
 @app.get("/")
 async def root():
+    # Serve the frontend index.html for the root route
+    if INDEX_FILE.exists():
+        return FileResponse(INDEX_FILE, media_type="text/html")
     return {
         "message": "Welcome to Metsa Document Portal API",
         "version": settings.APP_VERSION,
         "docs": "/docs"
     }
 
-# Serve Next.js static export (built assets)
-FRONTEND_DIR = Path(__file__).resolve().parents[2] / "metsa-frontend" / "out"
-INDEX_FILE = FRONTEND_DIR / "index.html"
-
 @app.get("/{full_path:path}")
 async def serve_frontend(full_path: str):
     # API routes are already handled by routers with /api/v1 prefix
     # This catches everything else and serves static files from Next.js export
     target = (FRONTEND_DIR / full_path).resolve()
     try:
-      # Prevent path traversal
-      target.relative_to(FRONTEND_DIR)
+        # Prevent path traversal
+        target.relative_to(FRONTEND_DIR)
     except Exception:
-      raise HTTPException(status_code=404, detail="Not Found")
+        # Fallback to index.html for SPA routes
+        if INDEX_FILE.exists():
+            return FileResponse(INDEX_FILE, media_type="text/html")
+        raise HTTPException(status_code=404, detail="Not Found")
 
     if target.is_dir():
         index_in_dir = target / "index.html"
         if index_in_dir.exists():
-            return FileResponse(index_in_dir)
+            return FileResponse(index_in_dir, media_type="text/html")
+    
     if target.exists() and target.is_file():
         return FileResponse(target)
+    
     # Fallback to top-level index.html for SPA routes
     if INDEX_FILE.exists():
-        return FileResponse(INDEX_FILE)
+        return FileResponse(INDEX_FILE, media_type="text/html")
+    
     raise HTTPException(status_code=404, detail="Frontend not built")
-
-
-@app.get("/health")
-async def health_check():
-    return {"status": "healthy"}