migrating vendor frontend to new architecture

2025-10-31 20:51:30 +01:00
parent 9420483ae6
commit 9611c03a36
25 changed files with 1618 additions and 286 deletions
--- a/app/api/v1/vendor/pages.py
+++ b/app/api/v1/vendor/pages.py
@@ -3,7 +3,7 @@
 Vendor HTML page routes using Jinja2 templates.

 These routes serve HTML pages for vendor-facing interfaces.
-Supports both path-based (/vendor/{vendor_code}/) and subdomain-based access.
+Follows the same minimal server-side rendering pattern as admin routes.

 All routes except /login require vendor authentication.
 Authentication failures redirect to /vendor/{vendor_code}/login.
@@ -24,9 +24,8 @@ Routes:
 from fastapi import APIRouter, Request, Depends, Path
 from fastapi.responses import HTMLResponse, RedirectResponse
 from fastapi.templating import Jinja2Templates
-from sqlalchemy.orm import Session

-from app.api.deps import get_current_vendor_user, get_db
+from app.api.deps import get_current_vendor_user
 from models.database.user import User

 router = APIRouter()
@@ -37,22 +36,37 @@ templates = Jinja2Templates(directory="app/templates")
 # PUBLIC ROUTES (No Authentication Required)
 # ============================================================================

-@router.get("/vendor/{vendor_code}/", response_class=RedirectResponse, include_in_schema=False)
-async def vendor_root(vendor_code: str = Path(..., description="Vendor code")):
+@router.get("/{vendor_code}", response_class=RedirectResponse, include_in_schema=False)
+async def vendor_root_no_slash(vendor_code: str = Path(..., description="Vendor code")):
    """
-    Redirect /vendor/{code}/ to login page.
+    Redirect /vendor/{code} (no trailing slash) to login page.
+    Handles requests without trailing slash.
    """
    return RedirectResponse(url=f"/vendor/{vendor_code}/login", status_code=302)


-@router.get("/vendor/{vendor_code}/login", response_class=HTMLResponse, include_in_schema=False)
+@router.get("/{vendor_code}/", response_class=RedirectResponse, include_in_schema=False)
+async def vendor_root(vendor_code: str = Path(..., description="Vendor code")):
+    """
+    Redirect /vendor/{code}/ to login page.
+    Simple approach - let login page handle authenticated redirects.
+    """
+    return RedirectResponse(url=f"/vendor/{vendor_code}/login", status_code=302)
+
+
+@router.get("/{vendor_code}/login", response_class=HTMLResponse, include_in_schema=False)
 async def vendor_login_page(
-    request: Request,
-    vendor_code: str = Path(..., description="Vendor code")
+        request: Request,
+        vendor_code: str = Path(..., description="Vendor code")
 ):
    """
    Render vendor login page.
    No authentication required.
+
+    JavaScript will:
+    - Load vendor info via API
+    - Handle login form submission
+    - Redirect to dashboard on success
    """
    return templates.TemplateResponse(
        "vendor/login.html",
@@ -67,19 +81,23 @@ async def vendor_login_page(
 # AUTHENTICATED ROUTES (Vendor Users Only)
 # ============================================================================

-@router.get("/vendor/{vendor_code}/dashboard", response_class=HTMLResponse, include_in_schema=False)
+@router.get("/{vendor_code}/dashboard", response_class=HTMLResponse, include_in_schema=False)
 async def vendor_dashboard_page(
-    request: Request,
-    vendor_code: str = Path(..., description="Vendor code"),
-    current_user: User = Depends(get_current_vendor_user),
-    db: Session = Depends(get_db)
+        request: Request,
+        vendor_code: str = Path(..., description="Vendor code"),
+        current_user: User = Depends(get_current_vendor_user)
 ):
    """
    Render vendor dashboard.
-    Shows sales metrics, recent orders, and quick actions.
+
+    JavaScript will:
+    - Load vendor info via API
+    - Load dashboard stats via API
+    - Load recent orders via API
+    - Handle all interactivity
    """
    return templates.TemplateResponse(
-        "vendor/dashboard.html",
+        "vendor/admin/dashboard.html",
        {
            "request": request,
            "user": current_user,
@@ -92,17 +110,15 @@ async def vendor_dashboard_page(
 # PRODUCT MANAGEMENT
 # ============================================================================

-@router.get("/vendor/{vendor_code}/products", response_class=HTMLResponse, include_in_schema=False)
-@router.get("/vendor/{vendor_code}/admin/products", response_class=HTMLResponse, include_in_schema=False)
+@router.get("/{vendor_code}/products", response_class=HTMLResponse, include_in_schema=False)
 async def vendor_products_page(
-    request: Request,
-    vendor_code: str = Path(..., description="Vendor code"),
-    current_user: User = Depends(get_current_vendor_user),
-    db: Session = Depends(get_db)
+        request: Request,
+        vendor_code: str = Path(..., description="Vendor code"),
+        current_user: User = Depends(get_current_vendor_user)
 ):
    """
    Render products management page.
-    List, create, edit, and manage products.
+    JavaScript loads product list via API.
    """
    return templates.TemplateResponse(
        "vendor/admin/products.html",
@@ -118,17 +134,15 @@ async def vendor_products_page(
 # ORDER MANAGEMENT
 # ============================================================================

-@router.get("/vendor/{vendor_code}/orders", response_class=HTMLResponse, include_in_schema=False)
-@router.get("/vendor/{vendor_code}/admin/orders", response_class=HTMLResponse, include_in_schema=False)
+@router.get("/{vendor_code}/orders", response_class=HTMLResponse, include_in_schema=False)
 async def vendor_orders_page(
-    request: Request,
-    vendor_code: str = Path(..., description="Vendor code"),
-    current_user: User = Depends(get_current_vendor_user),
-    db: Session = Depends(get_db)
+        request: Request,
+        vendor_code: str = Path(..., description="Vendor code"),
+        current_user: User = Depends(get_current_vendor_user)
 ):
    """
    Render orders management page.
-    View and process orders.
+    JavaScript loads order list via API.
    """
    return templates.TemplateResponse(
        "vendor/admin/orders.html",
@@ -144,17 +158,15 @@ async def vendor_orders_page(
 # CUSTOMER MANAGEMENT
 # ============================================================================

-@router.get("/vendor/{vendor_code}/customers", response_class=HTMLResponse, include_in_schema=False)
-@router.get("/vendor/{vendor_code}/admin/customers", response_class=HTMLResponse, include_in_schema=False)
+@router.get("/{vendor_code}/customers", response_class=HTMLResponse, include_in_schema=False)
 async def vendor_customers_page(
-    request: Request,
-    vendor_code: str = Path(..., description="Vendor code"),
-    current_user: User = Depends(get_current_vendor_user),
-    db: Session = Depends(get_db)
+        request: Request,
+        vendor_code: str = Path(..., description="Vendor code"),
+        current_user: User = Depends(get_current_vendor_user)
 ):
    """
    Render customers management page.
-    View and manage customer relationships.
+    JavaScript loads customer list via API.
    """
    return templates.TemplateResponse(
        "vendor/admin/customers.html",
@@ -170,17 +182,15 @@ async def vendor_customers_page(
 # INVENTORY MANAGEMENT
 # ============================================================================

-@router.get("/vendor/{vendor_code}/inventory", response_class=HTMLResponse, include_in_schema=False)
-@router.get("/vendor/{vendor_code}/admin/inventory", response_class=HTMLResponse, include_in_schema=False)
+@router.get("/{vendor_code}/inventory", response_class=HTMLResponse, include_in_schema=False)
 async def vendor_inventory_page(
-    request: Request,
-    vendor_code: str = Path(..., description="Vendor code"),
-    current_user: User = Depends(get_current_vendor_user),
-    db: Session = Depends(get_db)
+        request: Request,
+        vendor_code: str = Path(..., description="Vendor code"),
+        current_user: User = Depends(get_current_vendor_user)
 ):
    """
    Render inventory management page.
-    Track and manage stock levels.
+    JavaScript loads inventory data via API.
    """
    return templates.TemplateResponse(
        "vendor/admin/inventory.html",
@@ -196,17 +206,15 @@ async def vendor_inventory_page(
 # MARKETPLACE IMPORTS
 # ============================================================================

-@router.get("/vendor/{vendor_code}/marketplace", response_class=HTMLResponse, include_in_schema=False)
-@router.get("/vendor/{vendor_code}/admin/marketplace", response_class=HTMLResponse, include_in_schema=False)
+@router.get("/{vendor_code}/marketplace", response_class=HTMLResponse, include_in_schema=False)
 async def vendor_marketplace_page(
-    request: Request,
-    vendor_code: str = Path(..., description="Vendor code"),
-    current_user: User = Depends(get_current_vendor_user),
-    db: Session = Depends(get_db)
+        request: Request,
+        vendor_code: str = Path(..., description="Vendor code"),
+        current_user: User = Depends(get_current_vendor_user)
 ):
    """
    Render marketplace import page.
-    Import products from external marketplaces.
+    JavaScript loads import jobs and products via API.
    """
    return templates.TemplateResponse(
        "vendor/admin/marketplace.html",
@@ -222,17 +230,15 @@ async def vendor_marketplace_page(
 # TEAM MANAGEMENT
 # ============================================================================

-@router.get("/vendor/{vendor_code}/team", response_class=HTMLResponse, include_in_schema=False)
-@router.get("/vendor/{vendor_code}/admin/team", response_class=HTMLResponse, include_in_schema=False)
+@router.get("/{vendor_code}/team", response_class=HTMLResponse, include_in_schema=False)
 async def vendor_team_page(
-    request: Request,
-    vendor_code: str = Path(..., description="Vendor code"),
-    current_user: User = Depends(get_current_vendor_user),
-    db: Session = Depends(get_db)
+        request: Request,
+        vendor_code: str = Path(..., description="Vendor code"),
+        current_user: User = Depends(get_current_vendor_user)
 ):
    """
    Render team management page.
-    Manage vendor staff and permissions.
+    JavaScript loads team members via API.
    """
    return templates.TemplateResponse(
        "vendor/admin/team.html",
@@ -248,16 +254,15 @@ async def vendor_team_page(
 # SETTINGS
 # ============================================================================

-@router.get("/vendor/{vendor_code}/settings", response_class=HTMLResponse, include_in_schema=False)
+@router.get("/{vendor_code}/settings", response_class=HTMLResponse, include_in_schema=False)
 async def vendor_settings_page(
-    request: Request,
-    vendor_code: str = Path(..., description="Vendor code"),
-    current_user: User = Depends(get_current_vendor_user),
-    db: Session = Depends(get_db)
+        request: Request,
+        vendor_code: str = Path(..., description="Vendor code"),
+        current_user: User = Depends(get_current_vendor_user)
 ):
    """
    Render vendor settings page.
-    Configure vendor preferences and integrations.
+    JavaScript loads settings via API.
    """
    return templates.TemplateResponse(
        "vendor/settings.html",
@@ -267,51 +272,3 @@ async def vendor_settings_page(
            "vendor_code": vendor_code,
        }
    )
-
-
-# ============================================================================
-# FALLBACK ROUTES (Query Parameter Based - For backward compatibility)
-# ============================================================================
-
-@router.get("/vendor/", response_class=RedirectResponse, include_in_schema=False)
-async def vendor_fallback_root():
-    """
-    Redirect to main site if no vendor code in path.
-    User should use /vendor/{code}/ format.
-    """
-    return RedirectResponse(url="/", status_code=302)
-
-
-@router.get("/vendor/login", response_class=HTMLResponse, include_in_schema=False)
-async def vendor_fallback_login(request: Request):
-    """
-    Fallback vendor login page (query parameter based).
-    For backward compatibility - new code should use /vendor/{code}/login
-    """
-    return templates.TemplateResponse(
-        "vendor/login.html",
-        {
-            "request": request,
-            "vendor_code": None,  # Will be retrieved from query param or localStorage
-        }
-    )
-
-
-@router.get("/vendor/dashboard", response_class=HTMLResponse, include_in_schema=False)
-async def vendor_fallback_dashboard(
-    request: Request,
-    current_user: User = Depends(get_current_vendor_user),
-    db: Session = Depends(get_db)
-):
-    """
-    Fallback vendor dashboard (query parameter based).
-    For backward compatibility - new code should use /vendor/{code}/dashboard
-    """
-    return templates.TemplateResponse(
-        "vendor/dashboard.html",
-        {
-            "request": request,
-            "user": current_user,
-            "vendor_code": None,  # Will be retrieved from token or localStorage
-        }
-    )