refactor: migrate templates and static files to self-contained modules
Templates Migration: - Migrate admin templates to modules (tenancy, billing, monitoring, marketplace, etc.) - Migrate vendor templates to modules (tenancy, billing, orders, messaging, etc.) - Migrate storefront templates to modules (catalog, customers, orders, cart, checkout, cms) - Migrate public templates to modules (billing, marketplace, cms) - Keep shared templates in app/templates/ (base.html, errors/, partials/, macros/) - Migrate letzshop partials to marketplace module Static Files Migration: - Migrate admin JS to modules: tenancy (23 files), core (5 files), monitoring (1 file) - Migrate vendor JS to modules: tenancy (4 files), core (2 files) - Migrate shared JS: vendor-selector.js to core, media-picker.js to cms - Migrate storefront JS: storefront-layout.js to core - Keep framework JS in static/ (api-client, utils, money, icons, log-config, lib/) - Update all template references to use module_static paths Naming Consistency: - Rename static/platform/ to static/public/ - Rename app/templates/platform/ to app/templates/public/ - Update all extends and static references Documentation: - Update module-system.md with shared templates documentation - Update frontend-structure.md with new module JS organization Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@@ -21,7 +21,7 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from app.api.deps import get_current_admin_api, require_module_access
|
||||
from app.core.database import get_db
|
||||
from app.services.order_service import order_service
|
||||
from app.modules.orders.services.order_service import order_service
|
||||
from models.schema.auth import UserContext
|
||||
from app.modules.orders.schemas import (
|
||||
AdminOrderItem,
|
||||
|
||||
@@ -16,7 +16,7 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from app.api.deps import get_current_admin_api, require_module_access
|
||||
from app.core.database import get_db
|
||||
from app.services.order_item_exception_service import order_item_exception_service
|
||||
from app.modules.orders.services.order_item_exception_service import order_item_exception_service
|
||||
from models.schema.auth import UserContext
|
||||
from app.modules.orders.schemas import (
|
||||
BulkResolveRequest,
|
||||
|
||||
@@ -20,11 +20,12 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from app.api.deps import get_current_customer_api
|
||||
from app.core.database import get_db
|
||||
from app.exceptions import OrderNotFoundException, VendorNotFoundException
|
||||
from app.exceptions.invoice import InvoicePDFNotFoundException
|
||||
from app.modules.orders.exceptions import OrderNotFoundException
|
||||
from app.modules.tenancy.exceptions import VendorNotFoundException
|
||||
from app.modules.orders.exceptions import InvoicePDFNotFoundException
|
||||
from app.modules.customers.schemas import CustomerContext
|
||||
from app.modules.orders.services import order_service
|
||||
from app.services.invoice_service import invoice_service # noqa: MOD-004 - Core invoice service
|
||||
from app.modules.orders.services.invoice_service import invoice_service # noqa: MOD-004 - Core invoice service
|
||||
from app.modules.orders.schemas import (
|
||||
OrderDetailResponse,
|
||||
OrderListResponse,
|
||||
|
||||
@@ -16,8 +16,8 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from app.api.deps import get_current_vendor_api, require_module_access
|
||||
from app.core.database import get_db
|
||||
from app.services.order_inventory_service import order_inventory_service
|
||||
from app.services.order_service import order_service
|
||||
from app.modules.orders.services.order_inventory_service import order_inventory_service
|
||||
from app.modules.orders.services.order_service import order_service
|
||||
from models.schema.auth import UserContext
|
||||
from app.modules.orders.schemas import (
|
||||
OrderDetailResponse,
|
||||
|
||||
@@ -15,7 +15,7 @@ from sqlalchemy.orm import Session
|
||||
|
||||
from app.api.deps import get_current_vendor_api, require_module_access
|
||||
from app.core.database import get_db
|
||||
from app.services.order_item_exception_service import order_item_exception_service
|
||||
from app.modules.orders.services.order_item_exception_service import order_item_exception_service
|
||||
from models.schema.auth import UserContext
|
||||
from app.modules.orders.schemas import (
|
||||
BulkResolveRequest,
|
||||
|
||||
@@ -34,10 +34,10 @@ from sqlalchemy.orm import Session
|
||||
from app.api.deps import get_current_vendor_api, require_module_access
|
||||
from app.core.database import get_db
|
||||
from app.core.feature_gate import RequireFeature
|
||||
from app.exceptions.invoice import (
|
||||
from app.modules.orders.exceptions import (
|
||||
InvoicePDFNotFoundException,
|
||||
)
|
||||
from app.services.invoice_service import invoice_service
|
||||
from app.modules.orders.services.invoice_service import invoice_service
|
||||
from app.modules.billing.models import FeatureCode
|
||||
from models.schema.auth import UserContext
|
||||
from app.modules.orders.schemas import (
|
||||
|
||||
@@ -1,4 +1,2 @@
|
||||
# Page routes will be added here
|
||||
# TODO: Add HTML page routes for admin/vendor dashboards
|
||||
|
||||
__all__ = []
|
||||
# app/modules/orders/routes/pages/__init__.py
|
||||
"""Orders module page routes."""
|
||||
|
||||
40
app/modules/orders/routes/pages/admin.py
Normal file
40
app/modules/orders/routes/pages/admin.py
Normal file
@@ -0,0 +1,40 @@
|
||||
# app/modules/orders/routes/pages/admin.py
|
||||
"""
|
||||
Orders Admin Page Routes (HTML rendering).
|
||||
|
||||
Admin pages for order management:
|
||||
- Orders list
|
||||
"""
|
||||
|
||||
from fastapi import APIRouter, Depends, Request
|
||||
from fastapi.responses import HTMLResponse
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.api.deps import get_db, require_menu_access
|
||||
from app.modules.core.utils.page_context import get_admin_context
|
||||
from app.templates_config import templates
|
||||
from models.database.admin_menu_config import FrontendType
|
||||
from models.database.user import User
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# ORDER MANAGEMENT ROUTES
|
||||
# ============================================================================
|
||||
|
||||
|
||||
@router.get("/orders", response_class=HTMLResponse, include_in_schema=False)
|
||||
async def admin_orders_page(
|
||||
request: Request,
|
||||
current_user: User = Depends(require_menu_access("orders", FrontendType.ADMIN)),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""
|
||||
Render orders management page.
|
||||
Shows orders across all vendors with filtering and status management.
|
||||
"""
|
||||
return templates.TemplateResponse(
|
||||
"orders/admin/orders.html",
|
||||
get_admin_context(request, current_user),
|
||||
)
|
||||
86
app/modules/orders/routes/pages/storefront.py
Normal file
86
app/modules/orders/routes/pages/storefront.py
Normal file
@@ -0,0 +1,86 @@
|
||||
# app/modules/orders/routes/pages/storefront.py
|
||||
"""
|
||||
Orders Storefront Page Routes (HTML rendering).
|
||||
|
||||
Storefront (customer shop) pages for order history:
|
||||
- Orders list
|
||||
- Order detail
|
||||
"""
|
||||
|
||||
import logging
|
||||
|
||||
from fastapi import APIRouter, Depends, Path, Request
|
||||
from fastapi.responses import HTMLResponse
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.api.deps import get_current_customer_from_cookie_or_header, get_db
|
||||
from app.modules.core.utils.page_context import get_storefront_context
|
||||
from app.modules.customers.models import Customer
|
||||
from app.templates_config import templates
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# CUSTOMER ACCOUNT - ORDERS (Authenticated)
|
||||
# ============================================================================
|
||||
|
||||
|
||||
@router.get("/account/orders", response_class=HTMLResponse, include_in_schema=False)
|
||||
async def shop_orders_page(
|
||||
request: Request,
|
||||
current_customer: Customer = Depends(get_current_customer_from_cookie_or_header),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""
|
||||
Render customer orders history page.
|
||||
Shows all past and current orders.
|
||||
Requires customer authentication.
|
||||
"""
|
||||
logger.debug(
|
||||
"[STOREFRONT] shop_orders_page REACHED",
|
||||
extra={
|
||||
"path": request.url.path,
|
||||
"vendor": getattr(request.state, "vendor", "NOT SET"),
|
||||
"context": getattr(request.state, "context_type", "NOT SET"),
|
||||
},
|
||||
)
|
||||
|
||||
return templates.TemplateResponse(
|
||||
"orders/storefront/orders.html",
|
||||
get_storefront_context(request, db=db, user=current_customer),
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
"/account/orders/{order_id}",
|
||||
response_class=HTMLResponse,
|
||||
include_in_schema=False,
|
||||
)
|
||||
async def shop_order_detail_page(
|
||||
request: Request,
|
||||
order_id: int = Path(..., description="Order ID"),
|
||||
current_customer: Customer = Depends(get_current_customer_from_cookie_or_header),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""
|
||||
Render customer order detail page.
|
||||
Shows detailed order information and tracking.
|
||||
Requires customer authentication.
|
||||
"""
|
||||
logger.debug(
|
||||
"[STOREFRONT] shop_order_detail_page REACHED",
|
||||
extra={
|
||||
"path": request.url.path,
|
||||
"order_id": order_id,
|
||||
"vendor": getattr(request.state, "vendor", "NOT SET"),
|
||||
"context": getattr(request.state, "context_type", "NOT SET"),
|
||||
},
|
||||
)
|
||||
|
||||
return templates.TemplateResponse(
|
||||
"orders/storefront/order-detail.html",
|
||||
get_storefront_context(request, db=db, user=current_customer, order_id=order_id),
|
||||
)
|
||||
73
app/modules/orders/routes/pages/vendor.py
Normal file
73
app/modules/orders/routes/pages/vendor.py
Normal file
@@ -0,0 +1,73 @@
|
||||
# app/modules/orders/routes/pages/vendor.py
|
||||
"""
|
||||
Orders Vendor Page Routes (HTML rendering).
|
||||
|
||||
Vendor pages for order management:
|
||||
- Orders list
|
||||
- Order detail
|
||||
"""
|
||||
|
||||
from fastapi import APIRouter, Depends, Path, Request
|
||||
from fastapi.responses import HTMLResponse
|
||||
from sqlalchemy.orm import Session
|
||||
|
||||
from app.api.deps import get_current_vendor_from_cookie_or_header, get_db
|
||||
from app.modules.core.utils.page_context import get_vendor_context
|
||||
from app.templates_config import templates
|
||||
from models.database.user import User
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# ORDER MANAGEMENT
|
||||
# ============================================================================
|
||||
|
||||
|
||||
@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_from_cookie_or_header),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""
|
||||
Render orders management page.
|
||||
JavaScript loads order list via API.
|
||||
"""
|
||||
return templates.TemplateResponse(
|
||||
"orders/vendor/orders.html",
|
||||
get_vendor_context(request, db, current_user, vendor_code),
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
"/{vendor_code}/orders/{order_id}",
|
||||
response_class=HTMLResponse,
|
||||
include_in_schema=False,
|
||||
)
|
||||
async def vendor_order_detail_page(
|
||||
request: Request,
|
||||
vendor_code: str = Path(..., description="Vendor code"),
|
||||
order_id: int = Path(..., description="Order ID"),
|
||||
current_user: User = Depends(get_current_vendor_from_cookie_or_header),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""
|
||||
Render order detail page.
|
||||
|
||||
Shows comprehensive order information including:
|
||||
- Order header and status
|
||||
- Customer and shipping details
|
||||
- Order items with shipment status
|
||||
- Invoice creation/viewing
|
||||
- Partial shipment controls
|
||||
|
||||
JavaScript loads order details via API.
|
||||
"""
|
||||
return templates.TemplateResponse(
|
||||
"orders/vendor/order-detail.html",
|
||||
get_vendor_context(request, db, current_user, vendor_code, order_id=order_id),
|
||||
)
|
||||
Reference in New Issue
Block a user