diff --git a/app/main.py b/app/main.py index 8483cd8..c721d75 100644 --- a/app/main.py +++ b/app/main.py @@ -26,6 +26,8 @@ from app.infrastructure.di.providers import ( from app.presentation import router from app.presentation.web import auth_router from app.presentation.web import router as web_router +from app.presentation.web.error_handlers import register_error_handlers +from app.presentation.web.flash import setup_flash_manager @asynccontextmanager @@ -71,6 +73,14 @@ def app_factory() -> FastAPI: setup_dishka(container, app) register_exception_handlers(app) + register_error_handlers(app) + + @app.middleware("http") + async def flash_middleware(request, call_next): + """Middleware to setup flash manager for each request.""" + await setup_flash_manager(request) + response = await call_next(request) + return response app.add_middleware( CORSMiddleware, diff --git a/app/presentation/templates/base.html b/app/presentation/templates/base.html index 14966c3..ce9aaa9 100644 --- a/app/presentation/templates/base.html +++ b/app/presentation/templates/base.html @@ -1,9 +1,35 @@ - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + {% block title %}Blog{% endblock %} @@ -17,6 +43,18 @@ {% include "partials/header.html" %} + + {% if flash_messages %} +
+ {% for msg in flash_messages %} + + {% endfor %} +
+ {% endif %} +
{% block content %}{% endblock %} @@ -26,6 +64,119 @@ {% include "partials/footer.html" %} + {% block extra_js %}{% endblock %} + + diff --git a/app/presentation/templates/pages/error.html b/app/presentation/templates/pages/error.html new file mode 100644 index 0000000..5454145 --- /dev/null +++ b/app/presentation/templates/pages/error.html @@ -0,0 +1,111 @@ +{% extends "base.html" %} + +{% block title %}{{ error_code }} - {{ error_title }}{% endblock %} +{% block meta_description %}{{ error_message }}{% endblock %} + +{% block content %} +
+
+
+ {% if error_code == 404 %} + 🔍 + {% elif error_code == 403 %} + 🚫 + {% elif error_code == 500 %} + ⚠️ + {% else %} + ❌ + {% endif %} +
+ +

{{ error_code }}

+

{{ error_title }}

+

{{ error_message }}

+ +
+ + + + + Go Home + + + {% if error_code == 403 %} + + Sign In + + {% endif %} + + +
+
+
+ + +{% endblock %} diff --git a/app/presentation/templates/pages/index.html b/app/presentation/templates/pages/index.html index e847b45..cbe67cd 100644 --- a/app/presentation/templates/pages/index.html +++ b/app/presentation/templates/pages/index.html @@ -1,6 +1,15 @@ {% extends "base.html" %} {% block title %}Blog - Home{% endblock %} +{% block meta_description %}Discover stories, thinking, and expertise from writers on any topic. A modern blog built with FastAPI.{% endblock %} +{% block meta_keywords %}blog, articles, posts, writing, fastapi, python{% endblock %} + +{% block og_type %}website{% endblock %} +{% block og_title %}Blog - Home{% endblock %} +{% block og_description %}Discover stories, thinking, and expertise from writers on any topic.{% endblock %} + +{% block twitter_title %}Blog - Home{% endblock %} +{% block twitter_description %}Discover stories, thinking, and expertise from writers on any topic.{% endblock %} {% block content %}
@@ -26,7 +35,7 @@

- {{ post.title }} + {{ post.title }}

{% if post.published %} Published @@ -55,7 +64,7 @@ {{ tag }} {% endfor %}
- + Read more diff --git a/app/presentation/templates/pages/post_detail.html b/app/presentation/templates/pages/post_detail.html index 9a17306..1b32b7e 100644 --- a/app/presentation/templates/pages/post_detail.html +++ b/app/presentation/templates/pages/post_detail.html @@ -2,6 +2,18 @@ {% block title %}{{ post.title }} - Blog{% endblock %} {% block meta_description %}{{ post.content.value[:160] }}{% endblock %} +{% block meta_keywords %}{{ post.tags|join(', ') }}{% endblock %} +{% block meta_author %}{{ post.author_id }}{% endblock %} + +{% block canonical_url %}{{ request.base_url }}web/posts/{{ post.slug.value }}{% endblock %} + +{% block og_type %}article{% endblock %} +{% block og_url %}{{ request.base_url }}web/posts/{{ post.slug.value }}{% endblock %} +{% block og_title %}{{ post.title }}{% endblock %} +{% block og_description %}{{ post.content.value[:160] }}{% endblock %} + +{% block twitter_title %}{{ post.title }}{% endblock %} +{% block twitter_description %}{{ post.content.value[:160] }}{% endblock %} {% block content %}
@@ -48,7 +60,7 @@ {% if can_edit or can_delete %}
{% if can_edit %} - + @@ -56,7 +68,7 @@ {% endif %} {% if can_delete %} -
+
- @@ -81,7 +81,7 @@
- + Cancel diff --git a/app/presentation/web/__init__.py b/app/presentation/web/__init__.py index 2dd259a..1911931 100644 --- a/app/presentation/web/__init__.py +++ b/app/presentation/web/__init__.py @@ -9,6 +9,7 @@ be integrated with use cases in future iterations. """ from app.presentation.web.auth import router as auth_router +from app.presentation.web.error_handlers import register_error_handlers from app.presentation.web.routes import router -__all__ = ["router", "auth_router"] +__all__ = ["router", "auth_router", "register_error_handlers"] diff --git a/app/presentation/web/error_handlers.py b/app/presentation/web/error_handlers.py new file mode 100644 index 0000000..db1f162 --- /dev/null +++ b/app/presentation/web/error_handlers.py @@ -0,0 +1,188 @@ +"""Error handlers and middleware for web UI. + +This module provides custom error pages and flash message middleware +for the web interface. +""" + +from typing import Any + +from fastapi import HTTPException, Request +from fastapi.responses import HTMLResponse, RedirectResponse +from fastapi.templating import Jinja2Templates + +from app.presentation.web.flash import FlashManager, get_flash_messages + +templates = Jinja2Templates(directory="app/presentation/templates") + + +async def setup_flash_manager(request: Request) -> None: + """Setup flash manager on request state. + + Args: + request: FastAPI request object. + """ + request.state.flash_manager = FlashManager(request) + + +async def add_flash_to_response(request: Request, response: HTMLResponse) -> None: + """Add flash cookie to response if needed. + + Args: + request: FastAPI request object. + response: FastAPI response object. + """ + if hasattr(request.state, "flash_manager"): + request.state.flash_manager.set_cookie(response) + + +def get_template_context(request: Request) -> dict[str, Any]: + """Get base template context with flash messages. + + Args: + request: FastAPI request object. + + Returns: + Template context dictionary. + """ + from app.presentation.web.deps import can_create_post, get_user_role + + user = getattr(request.state, "user", None) + user_role = get_user_role(user) + + return { + "request": request, + "user": user, + "user_role": user_role.value if user_role else None, + "can_create": can_create_post(user), + "flash_messages": get_flash_messages(request), + } + + +async def http_exception_handler(request: Request, exc: HTTPException) -> HTMLResponse: + """Handle HTTP exceptions with custom error pages. + + Args: + request: FastAPI request object. + exc: HTTPException instance. + + Returns: + HTMLResponse with error page. + """ + # Handle redirects (307, 308) + if exc.status_code in (307, 308) and "Location" in exc.headers: + return RedirectResponse(url=exc.headers["Location"], status_code=exc.status_code) + + error_pages = { + 403: ("Access Denied", "You don't have permission to access this page."), + 404: ("Page Not Found", "The page you're looking for doesn't exist."), + 500: ("Server Error", "Something went wrong on our end. Please try again later."), + } + + error_title, error_message = error_pages.get( + exc.status_code, ("Error", exc.detail or "An unexpected error occurred.") + ) + + context = get_template_context(request) + context.update( + { + "error_code": exc.status_code, + "error_title": error_title, + "error_message": error_message, + } + ) + + return templates.TemplateResponse( + "pages/error.html", + context, + status_code=exc.status_code, + ) + + +async def not_found_handler(request: Request, exc: HTTPException) -> HTMLResponse: + """Handle 404 Not Found errors. + + Args: + request: FastAPI request object. + exc: HTTPException instance. + + Returns: + HTMLResponse with 404 page. + """ + context = get_template_context(request) + context.update( + { + "error_code": 404, + "error_title": "Page Not Found", + "error_message": "The page you're looking for doesn't exist or has been moved.", + } + ) + + return templates.TemplateResponse( + "pages/error.html", + context, + status_code=404, + ) + + +async def forbidden_handler(request: Request, exc: HTTPException) -> HTMLResponse: + """Handle 403 Forbidden errors. + + Args: + request: FastAPI request object. + exc: HTTPException instance. + + Returns: + HTMLResponse with 403 page. + """ + context = get_template_context(request) + context.update( + { + "error_code": 403, + "error_title": "Access Denied", + "error_message": "You don't have permission to access this resource. Please sign in or contact an administrator.", + } + ) + + return templates.TemplateResponse( + "pages/error.html", + context, + status_code=403, + ) + + +async def server_error_handler(request: Request, exc: Exception) -> HTMLResponse: + """Handle 500 Internal Server Error. + + Args: + request: FastAPI request object. + exc: Exception instance. + + Returns: + HTMLResponse with 500 page. + """ + context = get_template_context(request) + context.update( + { + "error_code": 500, + "error_title": "Server Error", + "error_message": "Something went wrong on our end. Please try again later or contact support if the problem persists.", + } + ) + + return templates.TemplateResponse( + "pages/error.html", + context, + status_code=500, + ) + + +def register_error_handlers(app) -> None: + """Register error handlers with FastAPI app. + + Args: + app: FastAPI application instance. + """ + app.add_exception_handler(404, not_found_handler) + app.add_exception_handler(403, forbidden_handler) + app.add_exception_handler(500, server_error_handler) + app.add_exception_handler(HTTPException, http_exception_handler) diff --git a/app/presentation/web/flash.py b/app/presentation/web/flash.py new file mode 100644 index 0000000..7fbe83d --- /dev/null +++ b/app/presentation/web/flash.py @@ -0,0 +1,160 @@ +"""Flash messages middleware for web UI. + +This module provides flash message functionality for the web interface, +allowing temporary messages to be passed between requests (e.g., after redirect). +Uses signed cookies for security. +""" + +from fastapi import Request, Response +from itsdangerous import URLSafeSerializer + +from app.infrastructure.config.settings import settings + +FLASH_COOKIE_NAME = "flash_messages" +SERIALIZER = URLSafeSerializer(settings.security.secret_key.get_secret_value()) # type: ignore[union-attr] + + +class FlashMessage: + """Flash message model. + + Represents a single flash message with type and content. + + Attributes: + message: The message text. + category: Message category (success, error, warning, info). + """ + + def __init__(self, message: str, category: str = "info") -> None: + """Initialize flash message. + + Args: + message: The message text. + category: Message category (success, error, warning, info). + """ + self.message = message + self.category = category + + def to_dict(self) -> dict[str, str]: + """Convert to dictionary. + + Returns: + Dictionary with message and category. + """ + return {"message": self.message, "category": self.category} + + +class FlashManager: + """Manager for flash messages. + + Handles storing and retrieving flash messages from cookies. + Messages are cleared after being read. + + Attributes: + request: FastAPI request object. + messages: List of current messages. + """ + + CATEGORIES = { + "success": "success", + "error": "error", + "warning": "warning", + "info": "info", + } + + def __init__(self, request: Request) -> None: + """Initialize flash manager. + + Args: + request: FastAPI request object. + """ + self.request = request + self.messages: list[FlashMessage] = [] + self._load_messages() + + def _load_messages(self) -> None: + """Load messages from cookie.""" + cookie_value = self.request.cookies.get(FLASH_COOKIE_NAME) + if cookie_value: + try: + data = SERIALIZER.loads(cookie_value) + if isinstance(data, list): + self.messages = [FlashMessage(msg["message"], msg["category"]) for msg in data] + except Exception: + self.messages = [] + + def add(self, message: str, category: str = "info") -> None: + """Add a flash message. + + Args: + message: The message text. + category: Message category (success, error, warning, info). + """ + self.messages.append(FlashMessage(message, category)) + + def get_messages(self) -> list[dict[str, str]]: + """Get all messages and clear them. + + Returns: + List of message dictionaries. + """ + result = [msg.to_dict() for msg in self.messages] + self.messages = [] + return result + + def has_messages(self) -> bool: + """Check if there are any messages. + + Returns: + True if there are messages. + """ + return len(self.messages) > 0 + + def set_cookie(self, response: Response) -> None: + """Set flash cookie on response. + + Args: + response: FastAPI response object. + """ + if self.messages: + data = [msg.to_dict() for msg in self.messages] + cookie_value = SERIALIZER.dumps(data) + response.set_cookie( + key=FLASH_COOKIE_NAME, + value=cookie_value, + httponly=True, + secure=not settings.is_dev, + samesite="lax", + max_age=300, # 5 minutes + ) + else: + response.delete_cookie(key=FLASH_COOKIE_NAME) + + +def flash(request: Request, message: str, category: str = "info") -> None: + """Add flash message to request state. + + Convenience function to add flash message. + Must be called before response is created. + + Args: + request: FastAPI request object. + message: The message text. + category: Message category. + """ + if not hasattr(request.state, "flash_manager"): + request.state.flash_manager = FlashManager(request) + request.state.flash_manager.add(message, category) + + +def get_flash_messages(request: Request) -> list[dict[str, str]]: + """Get flash messages from request. + + Args: + request: FastAPI request object. + + Returns: + List of flash message dictionaries. + """ + if hasattr(request.state, "flash_manager"): + return request.state.flash_manager.get_messages() + return [] diff --git a/app/presentation/web/routes.py b/app/presentation/web/routes.py index 2afbbe5..eb44ec1 100644 --- a/app/presentation/web/routes.py +++ b/app/presentation/web/routes.py @@ -9,7 +9,7 @@ from typing import Any from uuid import uuid4 from fastapi import APIRouter, HTTPException, Request -from fastapi.responses import HTMLResponse +from fastapi.responses import HTMLResponse, RedirectResponse from fastapi.templating import Jinja2Templates from app.infrastructure.auth import TokenInfo @@ -22,6 +22,7 @@ from app.presentation.web.deps import ( can_see_draft, get_user_role, ) +from app.presentation.web.flash import flash router = APIRouter(prefix="/web", tags=["web"]) templates = Jinja2Templates(directory="app/presentation/templates") @@ -259,11 +260,11 @@ async def new_post_form( ) -@router.post("/posts/new", response_class=HTMLResponse) +@router.post("/posts/new") async def create_post( request: Request, user: RequireUserDep, -) -> HTMLResponse: +) -> RedirectResponse: """Handle new post creation form submission. Args: @@ -271,29 +272,17 @@ async def create_post( user: Current user (required). Returns: - HTMLResponse redirecting to the home page. + RedirectResponse to the new post or home page. """ - context = get_base_context(user) - visible_posts = filter_visible_posts(MOCK_POSTS, user) - - return templates.TemplateResponse( - request, - "pages/index.html", - { - **context, - "posts": visible_posts, - "active_page": "home", - "current_page": 1, - "has_prev": False, - "has_next": False, - }, - ) + flash(request, "Post created successfully!", "success") + response = RedirectResponse(url="/web/", status_code=303) + return response -@router.get("/posts/{post_id}", response_class=HTMLResponse) +@router.get("/posts/{post_slug}", response_class=HTMLResponse) async def post_detail( request: Request, - post_id: str, + post_slug: str, user: OptionalUserDep, ) -> HTMLResponse: """Render a single post detail page. @@ -309,7 +298,7 @@ async def post_detail( Raises: HTTPException: If post not found or not visible to user. """ - post = next((p for p in MOCK_POSTS if str(p.id) == post_id), None) + post = next((p for p in MOCK_POSTS if p.slug.value == post_slug), None) if not post: raise HTTPException(status_code=404, detail="Post not found") @@ -332,10 +321,10 @@ async def post_detail( ) -@router.get("/posts/{post_id}/edit", response_class=HTMLResponse) +@router.get("/posts/{post_slug}/edit", response_class=HTMLResponse) async def edit_post_form( request: Request, - post_id: str, + post_slug: str, user: RequireUserDep, ) -> HTMLResponse: """Render the post edit form. @@ -351,7 +340,7 @@ async def edit_post_form( Raises: HTTPException: If post not found or user cannot edit it. """ - post = next((p for p in MOCK_POSTS if str(p.id) == post_id), None) + post = next((p for p in MOCK_POSTS if p.slug.value == post_slug), None) if not post: raise HTTPException(status_code=404, detail="Post not found") @@ -373,10 +362,10 @@ async def edit_post_form( ) -@router.post("/posts/{post_id}/edit", response_class=HTMLResponse) +@router.post("/posts/{post_slug}/edit", response_class=HTMLResponse) async def update_post( request: Request, - post_id: str, + post_slug: str, user: RequireUserDep, ) -> HTMLResponse: """Handle post update form submission. @@ -392,7 +381,7 @@ async def update_post( Raises: HTTPException: If post not found or user cannot edit it. """ - post = next((p for p in MOCK_POSTS if str(p.id) == post_id), None) + post = next((p for p in MOCK_POSTS if p.slug.value == post_slug), None) if not post: raise HTTPException(status_code=404, detail="Post not found") @@ -415,10 +404,10 @@ async def update_post( ) -@router.post("/posts/{post_id}/delete", response_class=HTMLResponse) +@router.post("/posts/{post_slug}/delete", response_class=HTMLResponse) async def delete_post( request: Request, - post_id: str, + post_slug: str, user: RequireUserDep, ) -> HTMLResponse: """Handle post deletion. @@ -434,7 +423,7 @@ async def delete_post( Raises: HTTPException: If post not found or user cannot delete it. """ - post = next((p for p in MOCK_POSTS if str(p.id) == post_id), None) + post = next((p for p in MOCK_POSTS if p.slug.value == post_slug), None) if not post: raise HTTPException(status_code=404, detail="Post not found") diff --git a/pyproject.toml b/pyproject.toml index cd9e55f..7c83f5f 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -15,6 +15,7 @@ dependencies = [ "dishka>=1.5.0", "httpx>=0.28.0", "jinja2>=3.1.6", + "itsdangerous>=2.2.0", ] [build-system] diff --git a/static/images/favicon.svg b/static/images/favicon.svg new file mode 100644 index 0000000..10dcc9a --- /dev/null +++ b/static/images/favicon.svg @@ -0,0 +1,4 @@ + + + B + diff --git a/static/js/flash.js b/static/js/flash.js new file mode 100644 index 0000000..3cdece2 --- /dev/null +++ b/static/js/flash.js @@ -0,0 +1,69 @@ +/** + * Flash messages functionality for blog application. + * + * Handles auto-dismissal and manual closing of flash messages. + */ + +(function() { + 'use strict'; + + const AUTO_DISMISS_DELAY = 5000; // 5 seconds + + function initFlashMessages() { + const flashMessages = document.querySelectorAll('[data-testid^="flash-message-"]'); + + flashMessages.forEach(function(message) { + const closeBtn = message.querySelector('[data-testid="flash-close"]'); + + // Manual close + if (closeBtn) { + closeBtn.addEventListener('click', function() { + dismissMessage(message); + }); + } + + // Auto dismiss after delay + setTimeout(function() { + dismissMessage(message); + }, AUTO_DISMISS_DELAY); + + // Pause auto-dismiss on hover + message.addEventListener('mouseenter', function() { + message.classList.add('paused'); + }); + + message.addEventListener('mouseleave', function() { + message.classList.remove('paused'); + }); + }); + } + + function dismissMessage(message) { + if (message.classList.contains('paused')) { + // Retry after a short delay if paused + setTimeout(function() { + dismissMessage(message); + }, 1000); + return; + } + + message.classList.add('fade-out'); + + setTimeout(function() { + message.remove(); + + // Remove container if empty + const container = document.querySelector('[data-testid="flash-container"]'); + if (container && container.children.length === 0) { + container.remove(); + } + }, 300); + } + + // Initialize on DOM ready + if (document.readyState === 'loading') { + document.addEventListener('DOMContentLoaded', initFlashMessages); + } else { + initFlashMessages(); + } +})();