next front end

app/api/admin.py

@@ -17,6 +17,9 @@ from datetime import datetime, timedelta, date
 from pathlib import Path
 
 from app.database.base import get_db
+
+# Track application start time
+APPLICATION_START_TIME = time.time()
 from app.models import User, Rolodex, File as FileModel, Ledger, QDRO, AuditLog, LoginAttempt
 from app.models.lookups import SystemSetup, Employee, FileType, FileStatus, TransactionType, TransactionCode, State, FormIndex
 from app.auth.security import get_admin_user, get_password_hash, create_access_token
@@ -219,13 +222,9 @@ async def system_health(
     except:
         alerts.append("Unable to check backup status")
     
-    # System uptime (simplified)
-    try:
-        import psutil
-        uptime_seconds = time.time() - psutil.boot_time()
-        uptime = str(timedelta(seconds=int(uptime_seconds)))
-    except ImportError:
-        uptime = "Unknown"
+    # Application uptime
+    uptime_seconds = int(time.time() - APPLICATION_START_TIME)
+    uptime = str(timedelta(seconds=uptime_seconds))
     
     status = "healthy" if db_connected and disk_available and memory_available else "unhealthy"
     
@@ -287,14 +286,9 @@ async def system_statistics(
     except:
         pass
     
-    # System uptime (simplified)
-    system_uptime = "Unknown"
-    try:
-        import psutil
-        uptime_seconds = time.time() - psutil.boot_time()
-        system_uptime = str(timedelta(seconds=int(uptime_seconds)))
-    except ImportError:
-        pass
+    # Application uptime
+    uptime_seconds = int(time.time() - APPLICATION_START_TIME)
+    system_uptime = str(timedelta(seconds=uptime_seconds))
     
     # Recent activity (last 10 actions)
     recent_activity = []

app/main.py

@@ -1,15 +1,17 @@
 """
 Delphi Consulting Group Database System - Main FastAPI Application
 """
-from fastapi import FastAPI, Request
+from fastapi import FastAPI, Request, Depends
 from fastapi.staticfiles import StaticFiles
 from fastapi.templating import Jinja2Templates
-from fastapi.responses import HTMLResponse
+from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.middleware.cors import CORSMiddleware
 
 from app.config import settings
 from app.database.base import engine
 from app.models import BaseModel
+from app.models.user import User
+from app.auth.security import get_admin_user
 
 # Create database tables
 BaseModel.metadata.create_all(bind=engine)
@@ -54,7 +56,7 @@ app.include_router(financial_router, prefix="/api/financial", tags=["financial"]
 app.include_router(documents_router, prefix="/api/documents", tags=["documents"])
 app.include_router(search_router, prefix="/api/search", tags=["search"])
 app.include_router(admin_router, prefix="/api/admin", tags=["admin"])
-app.include_router(import_router, tags=["import"])
+app.include_router(import_router, prefix="/api/import", tags=["import"])
 app.include_router(support_router, prefix="/api/support", tags=["support"])
 
 
@@ -85,13 +87,6 @@ async def customers_page(request: Request):
     )
 
 
-@app.get("/import", response_class=HTMLResponse)
-async def import_page(request: Request):
-    """Data import management page"""
-    return templates.TemplateResponse(
-        "import.html",
-        {"request": request, "title": "Data Import - " + settings.app_name}
-    )
 
 
 @app.get("/files", response_class=HTMLResponse)
@@ -132,7 +127,7 @@ async def search_page(request: Request):
 
 @app.get("/admin", response_class=HTMLResponse)
 async def admin_page(request: Request):
-    """System administration page"""
+    """System administration page (admin only)"""
     return templates.TemplateResponse(
         "admin.html",
         {"request": request, "title": "System Administration - " + settings.app_name}