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:
@@ -23,14 +23,15 @@ from sqlalchemy.orm import Session
|
||||
from app.api.deps import get_current_customer_api
|
||||
from app.core.database import get_db
|
||||
from app.core.environment import should_use_secure_cookies
|
||||
from app.exceptions import ValidationException, VendorNotFoundException
|
||||
from app.exceptions import ValidationException
|
||||
from app.modules.tenancy.exceptions import VendorNotFoundException
|
||||
from app.modules.customers.schemas import CustomerContext
|
||||
from app.modules.customers.services import (
|
||||
customer_address_service,
|
||||
customer_service,
|
||||
)
|
||||
from app.services.auth_service import AuthService # noqa: MOD-004 - Core auth service
|
||||
from app.services.email_service import EmailService # noqa: MOD-004 - Core email service
|
||||
from app.modules.core.services.auth_service import AuthService # noqa: MOD-004 - Core auth service
|
||||
from app.modules.messaging.services.email_service import EmailService # noqa: MOD-004 - Core email service
|
||||
from app.modules.customers.models import PasswordResetToken
|
||||
from models.schema.auth import (
|
||||
LogoutResponse,
|
||||
|
||||
@@ -1,4 +1,2 @@
|
||||
# Page routes will be added here
|
||||
# TODO: Add HTML page routes for admin/vendor dashboards
|
||||
|
||||
__all__ = []
|
||||
# app/modules/customers/routes/pages/__init__.py
|
||||
"""Customers module page routes."""
|
||||
|
||||
40
app/modules/customers/routes/pages/admin.py
Normal file
40
app/modules/customers/routes/pages/admin.py
Normal file
@@ -0,0 +1,40 @@
|
||||
# app/modules/customers/routes/pages/admin.py
|
||||
"""
|
||||
Customers Admin Page Routes (HTML rendering).
|
||||
|
||||
Admin pages for customer management:
|
||||
- Customers 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()
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# CUSTOMER MANAGEMENT ROUTES
|
||||
# ============================================================================
|
||||
|
||||
|
||||
@router.get("/customers", response_class=HTMLResponse, include_in_schema=False)
|
||||
async def admin_customers_page(
|
||||
request: Request,
|
||||
current_user: User = Depends(require_menu_access("customers", FrontendType.ADMIN)),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""
|
||||
Render customers management page.
|
||||
Shows list of all platform customers.
|
||||
"""
|
||||
return templates.TemplateResponse(
|
||||
"customers/admin/customers.html",
|
||||
get_admin_context(request, current_user),
|
||||
)
|
||||
276
app/modules/customers/routes/pages/storefront.py
Normal file
276
app/modules/customers/routes/pages/storefront.py
Normal file
@@ -0,0 +1,276 @@
|
||||
# app/modules/customers/routes/pages/storefront.py
|
||||
"""
|
||||
Customers Storefront Page Routes (HTML rendering).
|
||||
|
||||
Storefront (customer shop) pages for customer account:
|
||||
- Registration
|
||||
- Login
|
||||
- Forgot password
|
||||
- Reset password
|
||||
- Account dashboard
|
||||
- Profile management
|
||||
- Addresses
|
||||
- Settings
|
||||
"""
|
||||
|
||||
import logging
|
||||
|
||||
from fastapi import APIRouter, Depends, Request
|
||||
from fastapi.responses import HTMLResponse, RedirectResponse
|
||||
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 - PUBLIC ROUTES (No Authentication)
|
||||
# ============================================================================
|
||||
|
||||
|
||||
@router.get("/account/register", response_class=HTMLResponse, include_in_schema=False)
|
||||
async def shop_register_page(request: Request, db: Session = Depends(get_db)):
|
||||
"""
|
||||
Render customer registration page.
|
||||
No authentication required.
|
||||
"""
|
||||
logger.debug(
|
||||
"[STOREFRONT] shop_register_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(
|
||||
"customers/storefront/register.html", get_storefront_context(request, db=db)
|
||||
)
|
||||
|
||||
|
||||
@router.get("/account/login", response_class=HTMLResponse, include_in_schema=False)
|
||||
async def shop_login_page(request: Request, db: Session = Depends(get_db)):
|
||||
"""
|
||||
Render customer login page.
|
||||
No authentication required.
|
||||
"""
|
||||
logger.debug(
|
||||
"[STOREFRONT] shop_login_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(
|
||||
"customers/storefront/login.html", get_storefront_context(request, db=db)
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
"/account/forgot-password", response_class=HTMLResponse, include_in_schema=False
|
||||
)
|
||||
async def shop_forgot_password_page(request: Request, db: Session = Depends(get_db)):
|
||||
"""
|
||||
Render forgot password page.
|
||||
Allows customers to reset their password.
|
||||
"""
|
||||
logger.debug(
|
||||
"[STOREFRONT] shop_forgot_password_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(
|
||||
"customers/storefront/forgot-password.html", get_storefront_context(request, db=db)
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
"/account/reset-password", response_class=HTMLResponse, include_in_schema=False
|
||||
)
|
||||
async def shop_reset_password_page(
|
||||
request: Request, token: str = None, db: Session = Depends(get_db)
|
||||
):
|
||||
"""
|
||||
Render reset password page.
|
||||
User lands here after clicking the reset link in their email.
|
||||
Token is passed as query parameter.
|
||||
"""
|
||||
logger.debug(
|
||||
"[STOREFRONT] shop_reset_password_page REACHED",
|
||||
extra={
|
||||
"path": request.url.path,
|
||||
"vendor": getattr(request.state, "vendor", "NOT SET"),
|
||||
"context": getattr(request.state, "context_type", "NOT SET"),
|
||||
"has_token": bool(token),
|
||||
},
|
||||
)
|
||||
|
||||
return templates.TemplateResponse(
|
||||
"customers/storefront/reset-password.html", get_storefront_context(request, db=db)
|
||||
)
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# CUSTOMER ACCOUNT - ROOT REDIRECT
|
||||
# ============================================================================
|
||||
|
||||
|
||||
@router.get("/account", response_class=RedirectResponse, include_in_schema=False)
|
||||
@router.get("/account/", response_class=RedirectResponse, include_in_schema=False)
|
||||
async def shop_account_root(request: Request):
|
||||
"""
|
||||
Redirect /storefront/account or /storefront/account/ to dashboard.
|
||||
"""
|
||||
logger.debug(
|
||||
"[STOREFRONT] shop_account_root REACHED",
|
||||
extra={
|
||||
"path": request.url.path,
|
||||
"vendor": getattr(request.state, "vendor", "NOT SET"),
|
||||
"context": getattr(request.state, "context_type", "NOT SET"),
|
||||
},
|
||||
)
|
||||
|
||||
# Get base_url from context for proper redirect
|
||||
vendor = getattr(request.state, "vendor", None)
|
||||
vendor_context = getattr(request.state, "vendor_context", None)
|
||||
access_method = (
|
||||
vendor_context.get("detection_method", "unknown")
|
||||
if vendor_context
|
||||
else "unknown"
|
||||
)
|
||||
|
||||
base_url = "/"
|
||||
if access_method == "path" and vendor:
|
||||
full_prefix = (
|
||||
vendor_context.get("full_prefix", "/vendor/")
|
||||
if vendor_context
|
||||
else "/vendor/"
|
||||
)
|
||||
base_url = f"{full_prefix}{vendor.subdomain}/"
|
||||
|
||||
return RedirectResponse(url=f"{base_url}storefront/account/dashboard", status_code=302)
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# CUSTOMER ACCOUNT - AUTHENTICATED ROUTES
|
||||
# ============================================================================
|
||||
|
||||
|
||||
@router.get(
|
||||
"/account/dashboard", response_class=HTMLResponse, include_in_schema=False
|
||||
)
|
||||
async def shop_account_dashboard_page(
|
||||
request: Request,
|
||||
current_customer: Customer = Depends(get_current_customer_from_cookie_or_header),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""
|
||||
Render customer account dashboard.
|
||||
Shows account overview, recent orders, and quick links.
|
||||
Requires customer authentication.
|
||||
"""
|
||||
logger.debug(
|
||||
"[STOREFRONT] shop_account_dashboard_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(
|
||||
"customers/storefront/dashboard.html",
|
||||
get_storefront_context(request, db=db, user=current_customer),
|
||||
)
|
||||
|
||||
|
||||
@router.get("/account/profile", response_class=HTMLResponse, include_in_schema=False)
|
||||
async def shop_profile_page(
|
||||
request: Request,
|
||||
current_customer: Customer = Depends(get_current_customer_from_cookie_or_header),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""
|
||||
Render customer profile page.
|
||||
Edit personal information and preferences.
|
||||
Requires customer authentication.
|
||||
"""
|
||||
logger.debug(
|
||||
"[STOREFRONT] shop_profile_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(
|
||||
"customers/storefront/profile.html",
|
||||
get_storefront_context(request, db=db, user=current_customer),
|
||||
)
|
||||
|
||||
|
||||
@router.get(
|
||||
"/account/addresses", response_class=HTMLResponse, include_in_schema=False
|
||||
)
|
||||
async def shop_addresses_page(
|
||||
request: Request,
|
||||
current_customer: Customer = Depends(get_current_customer_from_cookie_or_header),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""
|
||||
Render customer addresses management page.
|
||||
Manage shipping and billing addresses.
|
||||
Requires customer authentication.
|
||||
"""
|
||||
logger.debug(
|
||||
"[STOREFRONT] shop_addresses_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(
|
||||
"customers/storefront/addresses.html",
|
||||
get_storefront_context(request, db=db, user=current_customer),
|
||||
)
|
||||
|
||||
|
||||
@router.get("/account/settings", response_class=HTMLResponse, include_in_schema=False)
|
||||
async def shop_settings_page(
|
||||
request: Request,
|
||||
current_customer: Customer = Depends(get_current_customer_from_cookie_or_header),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""
|
||||
Render customer account settings page.
|
||||
Configure notifications, privacy, and preferences.
|
||||
Requires customer authentication.
|
||||
"""
|
||||
logger.debug(
|
||||
"[STOREFRONT] shop_settings_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(
|
||||
"customers/storefront/settings.html",
|
||||
get_storefront_context(request, db=db, user=current_customer),
|
||||
)
|
||||
42
app/modules/customers/routes/pages/vendor.py
Normal file
42
app/modules/customers/routes/pages/vendor.py
Normal file
@@ -0,0 +1,42 @@
|
||||
# app/modules/customers/routes/pages/vendor.py
|
||||
"""
|
||||
Customers Vendor Page Routes (HTML rendering).
|
||||
|
||||
Vendor pages for customer management:
|
||||
- Customers list
|
||||
"""
|
||||
|
||||
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()
|
||||
|
||||
|
||||
# ============================================================================
|
||||
# CUSTOMER MANAGEMENT
|
||||
# ============================================================================
|
||||
|
||||
|
||||
@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_from_cookie_or_header),
|
||||
db: Session = Depends(get_db),
|
||||
):
|
||||
"""
|
||||
Render customers management page.
|
||||
JavaScript loads customer list via API.
|
||||
"""
|
||||
return templates.TemplateResponse(
|
||||
"customers/vendor/customers.html",
|
||||
get_vendor_context(request, db, current_user, vendor_code),
|
||||
)
|
||||
Reference in New Issue
Block a user