diff --git a/README.md b/README.md index dbf85cd..16cbd76 100644 --- a/README.md +++ b/README.md @@ -1,38 +1,90 @@ # Cloud Reader -A full-stack cloud-based e-book reader application with cross-device synchronization. +A full-stack e-book reader application with cross-device sync. Upload EPUB/PDF files, track reading progress, bookmark passages, take notes, and customize your reading experience. ## Architecture -- **Backend**: Django 5.x + Django REST Framework -- **Frontend**: React with TypeScript -- **Database**: PostgreSQL -- **Monorepo**: Yarn workspaces +``` +cloud-reader/ +├── backend/ # Django REST API (canonical backend) +│ ├── config/ # Django project settings +│ ├── apps/ +│ │ ├── users/ # User auth (JWT) +│ │ ├── books/ # Books, e-books, reading progress, settings +│ │ └── annotations/ # Bookmarks and notes +│ ├── manage.py +│ └── requirements.txt +├── frontend/ # React + Vite + TypeScript (web frontend) +│ ├── src/ +│ │ ├── api/ # API client (axios with JWT refresh) +│ │ ├── components/ # Reusable components +│ │ ├── context/ # Auth and annotations context +│ │ ├── hooks/ # Custom hooks +│ │ ├── pages/ # Route pages (Library, Reader, AddBook, Auth, Settings) +│ │ └── types/ # TypeScript type definitions +│ └── package.json +├── mobile/ # Expo React Native app (mobile frontend) +│ ├── src/ +│ │ ├── api/ # API client (axios with JWT refresh via AsyncStorage) +│ │ ├── components/ # Reusable UI components +│ │ ├── context/ # Auth context +│ │ ├── hooks/ # Custom hooks +│ │ ├── navigation/ # React Navigation (Auth stack + Main tabs) +│ │ ├── screens/ # Screen-level components (Login, Library, etc.) +│ │ └── types/ # Mobile-specific types +│ ├── App.tsx +│ └── app.json +├── packages/ +│ └── shared/ # @cloud-reader/shared — domain types & utilities +│ └── src/ +│ ├── types.ts # Shared domain types (Book, User, Bookmark, Note, etc.) +│ └── utils.ts # Date formatting, validation, API endpoint constants +├── package.json # Root — yarn workspaces config +└── docker-compose.yml +``` -## Getting Started +## Quick Start -### Prerequisites -- Python 3.12+ -- Node.js 20+ -- PostgreSQL 15+ +### Docker (recommended) +```bash +docker compose up --build +``` +- **Frontend:** http://localhost:5173 +- **Backend API:** http://localhost:8000/api/ -### Backend Setup +### Backend (standalone) ```bash cd backend -python -m venv .venv -source .venv/bin/activate pip install -r requirements.txt python manage.py migrate python manage.py runserver ``` -### Frontend Setup +### Frontend (standalone) ```bash cd frontend yarn install yarn dev ``` -## Projects +### Mobile (Expo) +```bash +# From monorepo root — installs all workspaces including mobile +yarn install -See [Gitea Issues](https://gitea-dev.codescripters.org/crisleo-hermes/cloud-reader/issues) for the full roadmap. \ No newline at end of file +# Start Expo dev server +yarn workspace @cloud-reader/mobile start + +# Or cd into mobile and run directly +cd mobile +npx expo start +``` + +> The mobile app requires the backend to be running. Set `EXPO_PUBLIC_API_URL` environment variable in your shell or `.env` file to point to the backend (defaults to `http://10.0.2.2:8000` for Android emulator). + +## Migration Notes +Consolidated from duplicate `api/` + `web/` into single `backend/` + `frontend/` canonical structure. +- `backend/` kept as canonical; `api/` features (e-book uploads, reading progress, reading settings) merged in. +- `frontend/` kept as canonical; `web/` pages (Library, Reader, AddBook, Auth, Settings) merged in. +- `api/` and `web/` directories removed. +- `mobile/` added as Expo React Native app with shared `@cloud-reader/shared` package. \ No newline at end of file diff --git a/api/books/__init__.py b/api/books/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/api/books/admin.py b/api/books/admin.py deleted file mode 100644 index 810af01..0000000 --- a/api/books/admin.py +++ /dev/null @@ -1,20 +0,0 @@ -from django.contrib import admin - -from books.models import Book, ReadingProgress, ReadingSettings - - -@admin.register(Book) -class BookAdmin(admin.ModelAdmin): - list_display = ["title", "author", "user", "created_at"] - list_filter = ["created_at", "user"] - search_fields = ["title", "author"] - - -@admin.register(ReadingProgress) -class ReadingProgressAdmin(admin.ModelAdmin): - list_display = ["book", "user", "current_position", "updated_at"] - - -@admin.register(ReadingSettings) -class ReadingSettingsAdmin(admin.ModelAdmin): - list_display = ["user", "font_size", "font_style", "background_color"] \ No newline at end of file diff --git a/api/books/apps.py b/api/books/apps.py deleted file mode 100644 index a36e8ef..0000000 --- a/api/books/apps.py +++ /dev/null @@ -1,6 +0,0 @@ -from django.apps import AppConfig - - -class BooksConfig(AppConfig): - default_auto_field = "django.db.models.BigAutoField" - name = "books" \ No newline at end of file diff --git a/api/books/management/__init__.py b/api/books/management/__init__.py deleted file mode 100644 index a693ec4..0000000 --- a/api/books/management/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# management/__init__.py \ No newline at end of file diff --git a/api/books/management/commands/__init__.py b/api/books/management/commands/__init__.py deleted file mode 100644 index 61f42e0..0000000 --- a/api/books/management/commands/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# management/commands/__init__.py \ No newline at end of file diff --git a/api/books/management/commands/seed_books.py b/api/books/management/commands/seed_books.py deleted file mode 100644 index 7d94c32..0000000 --- a/api/books/management/commands/seed_books.py +++ /dev/null @@ -1,134 +0,0 @@ -""" -Management command to seed sample book data for development and testing. -""" -from __future__ import annotations - -from typing import Any - -from django.core.management.base import BaseCommand - -from books.models import Book, ReadingStatus - -SAMPLE_BOOKS: list[dict[str, Any]] = [ - { - "title": "The Great Gatsby", - "author": "F. Scott Fitzgerald", - "genre": "Classic Literature", - "description": "A story of the mysteriously wealthy Jay Gatsby and his love for the beautiful Daisy Buchanan.", - "reading_status": ReadingStatus.FINISHED, - }, - { - "title": "To Kill a Mockingbird", - "author": "Harper Lee", - "genre": "Classic Literature", - "description": "The unforgettable novel of a childhood in a sleepy Southern town and the crisis of conscience that rocked it.", - "reading_status": ReadingStatus.FINISHED, - }, - { - "title": "1984", - "author": "George Orwell", - "genre": "Science Fiction", - "description": "A dystopian social science fiction novel and cautionary tale about the future of totalitarianism.", - "reading_status": ReadingStatus.READING, - }, - { - "title": "Dune", - "author": "Frank Herbert", - "genre": "Science Fiction", - "description": "Set on the desert planet Arrakis, it is one of the world's best-selling science fiction novels.", - "reading_status": ReadingStatus.FINISHED, - }, - { - "title": "The Hobbit", - "author": "J.R.R. Tolkien", - "genre": "Fantasy", - "description": "Bilbo Baggins is swept into a quest to reclaim the lost Dwarf Kingdom of Erebor from the fearsome dragon Smaug.", - "reading_status": ReadingStatus.FINISHED, - }, - { - "title": "Pride and Prejudice", - "author": "Jane Austen", - "genre": "Romance", - "description": "A romantic novel of manners that follows the character development of Elizabeth Bennet.", - "reading_status": ReadingStatus.WANT_TO_READ, - }, - { - "title": "The Martian", - "author": "Andy Weir", - "genre": "Science Fiction", - "description": "An astronaut becomes stranded alone on Mars and must find a way to signal that he is alive.", - "reading_status": ReadingStatus.READING, - }, - { - "title": "The Catcher in the Rye", - "author": "J.D. Salinger", - "genre": "Classic Literature", - "description": "The story of Holden Caulfield's experiences in New York City after being expelled from prep school.", - "reading_status": ReadingStatus.DNF, - }, - { - "title": "The Alchemist", - "author": "Paulo Coelho", - "genre": "Philosophy", - "description": "A young Andalusian shepherd follows his dream to find treasure at the Egyptian pyramids.", - "reading_status": ReadingStatus.WANT_TO_READ, - }, - { - "title": "Neuromancer", - "author": "William Gibson", - "genre": "Science Fiction", - "description": "The novel that launched the cyberpunk genre, following washed-up computer hacker Henry Case.", - "reading_status": ReadingStatus.FINISHED, - }, - { - "title": "The Name of the Wind", - "author": "Patrick Rothfuss", - "genre": "Fantasy", - "description": "The tale of the magically gifted young man who grows to be the most notorious wizard his world has ever seen.", - "reading_status": ReadingStatus.READING, - }, - { - "title": "Gone Girl", - "author": "Gillian Flynn", - "genre": "Thriller", - "description": "A mystery thriller about a wife's disappearance on the day of her fifth wedding anniversary.", - "reading_status": ReadingStatus.FINISHED, - }, - { - "title": "Sapiens", - "author": "Yuval Noah Harari", - "genre": "Non-Fiction", - "description": "A brief history of humankind, exploring how biology and history have defined us.", - "reading_status": ReadingStatus.FINISHED, - }, - { - "title": "The Road", - "author": "Cormac McCarthy", - "genre": "Post-Apocalyptic", - "description": "A father and his young son walk alone through burned America heading toward the coast.", - "reading_status": ReadingStatus.WANT_TO_READ, - }, - { - "title": "The Three-Body Problem", - "author": "Cixin Liu", - "genre": "Science Fiction", - "description": "The first novel in the Remembrance of Earth's Past trilogy, a blend of physics and alien contact.", - "reading_status": ReadingStatus.READING, - }, -] - - -class Command(BaseCommand): - """Seed the database with sample books.""" - - help = "Seeds the database with sample books for development and testing." - - def handle(self, *args: Any, **options: Any) -> str | None: - for i, book_data in enumerate(SAMPLE_BOOKS): - Book.objects.get_or_create( - title=book_data["title"], - author=book_data["author"], - defaults=book_data, - ) - count = Book.objects.count() - self.stdout.write(self.style.SUCCESS(f"Seeded {count} books into the database.")) \ No newline at end of file diff --git a/api/books/migrations/0001_initial.py b/api/books/migrations/0001_initial.py deleted file mode 100644 index f8a620f..0000000 --- a/api/books/migrations/0001_initial.py +++ /dev/null @@ -1,56 +0,0 @@ -import django.db.models.deletion -from django.db import migrations, models - - -class Migration(migrations.Migration): - - initial = True - - dependencies: list = [] - - operations = [ - migrations.CreateModel( - name="Book", - fields=[ - ( - "id", - models.BigAutoField( - auto_created=True, - primary_key=True, - serialize=False, - verbose_name="ID", - ), - ), - ("title", models.CharField(db_index=True, max_length=500)), - ("author", models.CharField(db_index=True, max_length=300)), - ("genre", models.CharField(db_index=True, max_length=100)), - ("description", models.TextField(blank=True, default="")), - ( - "reading_status", - models.CharField( - choices=[ - ("want_to_read", "Want to Read"), - ("reading", "Reading"), - ("finished", "Finished"), - ("dnf", "Did Not Finish"), - ], - db_index=True, - default="want_to_read", - max_length=20, - ), - ), - ("cover_url", models.URLField(blank=True, default="")), - ("created_at", models.DateTimeField(auto_now_add=True)), - ("updated_at", models.DateTimeField(auto_now=True)), - ], - options={ - "ordering": ["title"], - "indexes": [ - models.Index( - fields=["title", "author", "genre"], - name="books_book_title_2cc25e_idx", - ) - ], - }, - ), - ] \ No newline at end of file diff --git a/api/books/migrations/__init__.py b/api/books/migrations/__init__.py deleted file mode 100644 index f55c8b5..0000000 --- a/api/books/migrations/__init__.py +++ /dev/null @@ -1 +0,0 @@ -# migrations/__init__.py \ No newline at end of file diff --git a/api/books/models.py b/api/books/models.py deleted file mode 100644 index 797aac6..0000000 --- a/api/books/models.py +++ /dev/null @@ -1,111 +0,0 @@ -from enum import StrEnum -from pathlib import Path - -from django.conf import settings -from django.core.validators import FileExtensionValidator -from django.db import models -from django.db.models.signals import post_delete -from django.dispatch import receiver - - -class FontStyle(StrEnum): - SANS_SERIF = "sans-serif" - SERIF = "serif" - MONOSPACE = "monospace" - - -class BackgroundColor(StrEnum): - WHITE = "#ffffff" - SEPIA = "#f4e4c1" - DARK = "#1a1a2e" - GREEN = "#c7edcc" - - -class Book(models.Model): - user = models.ForeignKey( - settings.AUTH_USER_MODEL, - on_delete=models.CASCADE, - related_name="books", - ) - title = models.CharField(max_length=512) - author = models.CharField(max_length=256, blank=True, default="") - file = models.FileField( - upload_to="books/%Y/%m/%d/", - validators=[FileExtensionValidator(allowed_extensions=["epub", "pdf"])], - ) - cover_image = models.ImageField(upload_to="covers/%Y/%m/%d/", blank=True, null=True) - created_at = models.DateTimeField(auto_now_add=True) - updated_at = models.DateTimeField(auto_now=True) - - class Meta: - ordering = ["-created_at"] - indexes = [ - models.Index(fields=["user", "-created_at"]), - ] - - def __str__(self) -> str: - return self.title - - def filename(self) -> str: - return Path(self.file.name).name - - -@receiver(post_delete, sender=Book) -def _auto_delete_file_on_delete(sender: type[Book], instance: Book, **kwargs: object) -> None: - """Delete the uploaded file when the Book record is deleted.""" - if instance.file: - instance.file.delete(save=False) - if instance.cover_image: - instance.cover_image.delete(save=False) - - -class ReadingProgress(models.Model): - user = models.ForeignKey( - settings.AUTH_USER_MODEL, - on_delete=models.CASCADE, - related_name="reading_progress", - ) - book = models.OneToOneField( - Book, - on_delete=models.CASCADE, - related_name="reading_progress", - ) - current_position = models.FloatField(default=0.0) - """Position in the book as a percentage (0.0 to 100.0)""" - last_page = models.IntegerField(default=0) - """Last page/paragraph index for granular tracking""" - updated_at = models.DateTimeField(auto_now=True) - - class Meta: - verbose_name_plural = "reading progress" - unique_together = [("user", "book")] - - def __str__(self) -> str: - return f"{self.book.title} — {self.current_position:.1f}%" - - -class ReadingSettings(models.Model): - user = models.OneToOneField( - settings.AUTH_USER_MODEL, - on_delete=models.CASCADE, - related_name="reading_settings", - ) - font_size = models.IntegerField(default=18) - """Font size in pixels (min 12, max 36)""" - font_style = models.CharField( - max_length=20, - choices=[(s.value, s.name.replace("_", " ").title()) for s in FontStyle], - default=FontStyle.SANS_SERIF.value, - ) - background_color = models.CharField( - max_length=7, - choices=[(c.value, c.name.title()) for c in BackgroundColor], - default=BackgroundColor.WHITE.value, - ) - updated_at = models.DateTimeField(auto_now=True) - - class Meta: - verbose_name_plural = "reading settings" - - def __str__(self) -> str: - return f"Settings for {self.user}" \ No newline at end of file diff --git a/api/books/serializers.py b/api/books/serializers.py deleted file mode 100644 index 9e9417a..0000000 --- a/api/books/serializers.py +++ /dev/null @@ -1,136 +0,0 @@ -from rest_framework import serializers - -from books.models import Book, FontStyle, BackgroundColor, ReadingProgress, ReadingSettings - - -class BookListSerializer(serializers.ModelSerializer): - """Lightweight serializer for the library listing — no file or progress data.""" - - filename = serializers.CharField(read_only=True) - progress = serializers.SerializerMethodField() - - class Meta: - model = Book - fields = [ - "id", - "title", - "author", - "filename", - "cover_image", - "created_at", - "progress", - ] - - def get_progress(self, obj: Book) -> float | None: - try: - return obj.reading_progress.current_position - except ReadingProgress.DoesNotExist: - return None - - -class BookDetailSerializer(serializers.ModelSerializer): - """Full serializer for the reader view — includes file URL and progress.""" - - filename = serializers.CharField(read_only=True) - file_url = serializers.SerializerMethodField() - progress = serializers.SerializerMethodField() - - class Meta: - model = Book - fields = [ - "id", - "title", - "author", - "filename", - "file_url", - "cover_image", - "created_at", - "updated_at", - "progress", - ] - - def get_file_url(self, obj: Book) -> str: - request = self.context.get("request") - if request and obj.file: - return request.build_absolute_uri(obj.file.url) - return "" - - def get_progress(self, obj: Book) -> dict | None: - try: - rp = obj.reading_progress - return { - "current_position": rp.current_position, - "last_page": rp.last_page, - } - except ReadingProgress.DoesNotExist: - return None - - -class BookUploadSerializer(serializers.ModelSerializer): - """Serializer for uploading a new book.""" - - class Meta: - model = Book - fields = ["title", "author", "file", "cover_image"] - extra_kwargs = { - "title": {"required": True}, - "file": {"required": True}, - } - - def validate_file(self, value: object) -> object: - import os - if isinstance(value, type(None)): - return value - ext = os.path.splitext(str(getattr(value, 'name', '')))[1].lower() - if ext not in (".epub", ".pdf"): - raise serializers.ValidationError( - "Only EPUB and PDF files are supported." - ) - return value - - def create(self, validated_data: dict) -> Book: - validated_data["user"] = self.context["request"].user - return super().create(validated_data) - - -class ReadingProgressSerializer(serializers.ModelSerializer): - class Meta: - model = ReadingProgress - fields = ["current_position", "last_page"] - extra_kwargs = { - "current_position": {"required": True, "min_value": 0.0, "max_value": 100.0}, - } - - def validate_current_position(self, value: float) -> float: - if value < 0.0 or value > 100.0: - raise serializers.ValidationError( - "Position must be between 0.0 and 100.0." - ) - return value - - -class ReadingSettingsSerializer(serializers.ModelSerializer): - class Meta: - model = ReadingSettings - fields = ["font_size", "font_style", "background_color"] - - def validate_font_size(self, value: int) -> int: - if value < 12 or value > 36: - raise serializers.ValidationError("Font size must be between 12 and 36.") - return value - - def validate_font_style(self, value: str) -> str: - valid = [s.value for s in FontStyle] - if value not in valid: - raise serializers.ValidationError( - f"Font style must be one of: {', '.join(valid)}" - ) - return value - - def validate_background_color(self, value: str) -> str: - valid = [c.value for c in BackgroundColor] - if value not in valid: - raise serializers.ValidationError( - f"Background color must be one of: {', '.join(valid)}" - ) - return value \ No newline at end of file diff --git a/api/books/urls.py b/api/books/urls.py deleted file mode 100644 index cc780a0..0000000 --- a/api/books/urls.py +++ /dev/null @@ -1,15 +0,0 @@ -from django.urls import include, path -from rest_framework.routers import DefaultRouter - -from books.views import BookViewSet, ReadingSettingsViewSet - -router = DefaultRouter() -router.register(r"books", BookViewSet, basename="book") - -urlpatterns = [ - path("", include(router.urls)), - path("settings/", ReadingSettingsViewSet.as_view({ - "get": "list", - "patch": "partial_update", - }), name="reading-settings"), -] \ No newline at end of file diff --git a/api/books/views.py b/api/books/views.py deleted file mode 100644 index 5565c8f..0000000 --- a/api/books/views.py +++ /dev/null @@ -1,88 +0,0 @@ -from django.shortcuts import get_object_or_404 -from rest_framework import parsers, permissions, status, viewsets -from rest_framework.decorators import action -from rest_framework.request import Request -from rest_framework.response import Response - -from books.models import Book, ReadingProgress, ReadingSettings -from books.serializers import ( - BookDetailSerializer, - BookListSerializer, - BookUploadSerializer, - ReadingProgressSerializer, - ReadingSettingsSerializer, -) - - -class IsBookOwner(permissions.BasePermission): - """Only the owner of a book can access it.""" - - def has_object_permission( - self, request: Request, view: object, obj: Book - ) -> bool: - return obj.user == request.user - - -class BookViewSet(viewsets.ModelViewSet): - """API endpoint for managing user books.""" - - parser_classes = [parsers.MultiPartParser, parsers.FormParser, parsers.JSONParser] - permission_classes = [permissions.IsAuthenticated, IsBookOwner] - - def get_serializer_class(self) -> type: - if self.action == "create": - return BookUploadSerializer - if self.action == "list": - return BookListSerializer - return BookDetailSerializer - - def get_queryset(self): - return ( - Book.objects.filter(user=self.request.user) - .select_related("reading_progress", "user") - .prefetch_related() - ) - - @action(detail=True, methods=["get", "patch"]) - def progress(self, request: Request, pk: int | None = None) -> Response: - """Get or update reading progress for a specific book.""" - book = self.get_object() - progress, _created = ReadingProgress.objects.get_or_create( - user=request.user, - book=book, - ) - - if request.method == "GET": - serializer = ReadingProgressSerializer(progress) - return Response(serializer.data) - - serializer = ReadingProgressSerializer(progress, data=request.data, partial=True) - serializer.is_valid(raise_exception=True) - serializer.save() - return Response(serializer.data) - - -class ReadingSettingsViewSet(viewsets.GenericViewSet): - """API endpoint for user reading settings.""" - - permission_classes = [permissions.IsAuthenticated] - serializer_class = ReadingSettingsSerializer - - def get_queryset(self): - return ReadingSettings.objects.filter(user=self.request.user) - - def list(self, request: Request) -> Response: - settings, _created = ReadingSettings.objects.get_or_create( - user=request.user, - ) - serializer = self.get_serializer(settings) - return Response(serializer.data) - - def partial_update(self, request: Request) -> Response: - settings, _created = ReadingSettings.objects.get_or_create( - user=request.user, - ) - serializer = self.get_serializer(settings, data=request.data, partial=True) - serializer.is_valid(raise_exception=True) - serializer.save() - return Response(serializer.data) \ No newline at end of file diff --git a/api/manage.py b/api/manage.py deleted file mode 100644 index 0d704eb..0000000 --- a/api/manage.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python -"""Django's command-line utility for administrative tasks.""" -import os -import sys - - -def main() -> None: - os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project.settings") - try: - from django.core.management import execute_from_command_line - except ImportError as exc: - raise ImportError( - "Couldn't import Django. Are you sure it's installed and " - "available on your PYTHONPATH environment variable? Did you " - "forget to activate a virtual environment?" - ) from exc - execute_from_command_line(sys.argv) - - -if __name__ == "__main__": - main() \ No newline at end of file diff --git a/api/project/__init__.py b/api/project/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/api/project/settings.py b/api/project/settings.py deleted file mode 100644 index 4ade860..0000000 --- a/api/project/settings.py +++ /dev/null @@ -1,109 +0,0 @@ -import os -from pathlib import Path - -BASE_DIR = Path(__file__).resolve().parent.parent - -SECRET_KEY = os.environ.get("DJANGO_SECRET_KEY", "django-insecure-dev-change-me") -DEBUG = os.environ.get("DJANGO_DEBUG", "True").lower() in ("true", "1", "yes") -ALLOWED_HOSTS: list[str] = ["*"] - -INSTALLED_APPS = [ - "django.contrib.admin", - "django.contrib.auth", - "django.contrib.contenttypes", - "django.contrib.sessions", - "django.contrib.messages", - "django.contrib.staticfiles", - # Third-party - "rest_framework", - "rest_framework.authtoken", - "corsheaders", - # Local - "books", -] - -MIDDLEWARE = [ - "corsheaders.middleware.CorsMiddleware", - "django.middleware.security.SecurityMiddleware", - "django.contrib.sessions.middleware.SessionMiddleware", - "django.middleware.common.CommonMiddleware", - "django.middleware.csrf.CsrfViewMiddleware", - "django.contrib.auth.middleware.AuthenticationMiddleware", - "django.contrib.messages.middleware.MessageMiddleware", - "django.middleware.clickjacking.XFrameOptionsMiddleware", -] - -ROOT_URLCONF = "project.urls" - -TEMPLATES = [ - { - "BACKEND": "django.template.backends.django.DjangoTemplates", - "DIRS": [], - "APP_DIRS": True, - "OPTIONS": { - "context_processors": [ - "django.template.context_processors.debug", - "django.template.context_processors.request", - "django.contrib.auth.context_processors.auth", - "django.contrib.messages.context_processors.messages", - ], - }, - }, -] - -WSGI_APPLICATION = "project.wsgi.application" - -# ── Database ────────────────────────────────────────────── -_database_url = os.environ.get( - "DATABASE_URL", - "postgres://cloudreader:cloudreader@localhost:5432/cloudreader", -) -_db_parts = _database_url.replace("postgres://", "").split("@") -_credentials, _host_db = _db_parts[0], _db_parts[1] -_db_user, _db_pass = _credentials.split(":") -_host_port, _db_name = _host_db.split("/") -_db_host = _host_port.split(":")[0] -_db_port = _host_port.split(":")[1] if ":" in _host_port else "5432" - -DATABASES = { - "default": { - "ENGINE": "django.db.backends.postgresql", - "NAME": _db_name, - "USER": _db_user, - "PASSWORD": _db_pass, - "HOST": _db_host, - "PORT": _db_port, - } -} - -DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" - -# ── Auth / Password Validation ──────────────────────────── -AUTH_PASSWORD_VALIDATORS = [ - {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator"}, -] - -# ── DRF ─────────────────────────────────────────────────── -REST_FRAMEWORK = { - "DEFAULT_AUTHENTICATION_CLASSES": [ - "rest_framework.authentication.TokenAuthentication", - "rest_framework.authentication.SessionAuthentication", - ], - "DEFAULT_PERMISSION_CLASSES": [ - "rest_framework.permissions.IsAuthenticated", - ], -} - -# ── CORS ────────────────────────────────────────────────── -CORS_ALLOW_ALL_ORIGINS = True # dev only - -# ── Media / Uploads ─────────────────────────────────────── -MEDIA_URL = "/media/" -MEDIA_ROOT = BASE_DIR / "media" - -# ── i18n / Static ───────────────────────────────────────── -LANGUAGE_CODE = "en-us" -TIME_ZONE = "UTC" -USE_I18N = True -USE_TZ = True -STATIC_URL = "static/" \ No newline at end of file diff --git a/api/project/urls.py b/api/project/urls.py deleted file mode 100644 index e1d8e9b..0000000 --- a/api/project/urls.py +++ /dev/null @@ -1,7 +0,0 @@ -from django.contrib import admin -from django.urls import include, path - -urlpatterns = [ - path("admin/", admin.site.urls), - path("api/", include("books.urls")), -] \ No newline at end of file diff --git a/api/project/wsgi.py b/api/project/wsgi.py deleted file mode 100644 index e4f8bc8..0000000 --- a/api/project/wsgi.py +++ /dev/null @@ -1,6 +0,0 @@ -import os - -from django.core.wsgi import get_wsgi_application - -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project.settings") -application = get_wsgi_application() \ No newline at end of file diff --git a/api/pyproject.toml b/api/pyproject.toml deleted file mode 100644 index 733d710..0000000 --- a/api/pyproject.toml +++ /dev/null @@ -1,21 +0,0 @@ -[project] -name = "api" -version = "1.0.0" -description = "Cloud Reader API — Book Search and Discovery" -requires-python = ">=3.12" -dependencies = [ - "django>=5.1,<6.0", - "djangorestframework>=3.15,<4.0", - "django-cors-headers>=4.4,<5.0", - "django-filter>=24.3,<25.0", - "psycopg2-binary>=2.9,<3.0", - "pydantic>=2.0,<3.0", - "pydantic-settings>=2.0,<3.0", -] - -[build-system] -requires = ["setuptools"] -build-backend = "setuptools.build_meta" - -[tool.setuptools.packages.find] -include = ["books*", "project*"] \ No newline at end of file diff --git a/api/uv.lock b/api/uv.lock deleted file mode 100644 index 565a955..0000000 --- a/api/uv.lock +++ /dev/null @@ -1,290 +0,0 @@ -version = 1 -revision = 3 -requires-python = ">=3.12" - -[[package]] -name = "annotated-types" -version = "0.7.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/ee/67/531ea369ba64dcff5ec9c3402f9f51bf748cec26dde048a2f973a4eea7f5/annotated_types-0.7.0.tar.gz", hash = "sha256:aff07c09a53a08bc8cfccb9c85b05f1aa9a2a6f23728d790723543408344ce89", size = 16081, upload-time = "2024-05-20T21:33:25.928Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/78/b6/6307fbef88d9b5ee7421e68d78a9f162e0da4900bc5f5793f6d3d0e34fb8/annotated_types-0.7.0-py3-none-any.whl", hash = "sha256:1f02e8b43a8fbbc3f3e0d4f0f4bfc8131bcb4eebe8849b8e5c773f3a1c582a53", size = 13643, upload-time = "2024-05-20T21:33:24.1Z" }, -] - -[[package]] -name = "api" -version = "1.0.0" -source = { editable = "." } -dependencies = [ - { name = "django" }, - { name = "django-cors-headers" }, - { name = "django-filter" }, - { name = "djangorestframework" }, - { name = "psycopg2-binary" }, - { name = "pydantic" }, - { name = "pydantic-settings" }, -] - -[package.metadata] -requires-dist = [ - { name = "django", specifier = ">=5.1,<6.0" }, - { name = "django-cors-headers", specifier = ">=4.4,<5.0" }, - { name = "django-filter", specifier = ">=24.3,<25.0" }, - { name = "djangorestframework", specifier = ">=3.15,<4.0" }, - { name = "psycopg2-binary", specifier = ">=2.9,<3.0" }, - { name = "pydantic", specifier = ">=2.0,<3.0" }, - { name = "pydantic-settings", specifier = ">=2.0,<3.0" }, -] - -[[package]] -name = "asgiref" -version = "3.11.1" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/63/40/f03da1264ae8f7cfdbf9146542e5e7e8100a4c66ab48e791df9a03d3f6c0/asgiref-3.11.1.tar.gz", hash = "sha256:5f184dc43b7e763efe848065441eac62229c9f7b0475f41f80e207a114eda4ce", size = 38550, upload-time = "2026-02-03T13:30:14.33Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/5c/0a/a72d10ed65068e115044937873362e6e32fab1b7dce0046aeb224682c989/asgiref-3.11.1-py3-none-any.whl", hash = "sha256:e8667a091e69529631969fd45dc268fa79b99c92c5fcdda727757e52146ec133", size = 24345, upload-time = "2026-02-03T13:30:13.039Z" }, -] - -[[package]] -name = "django" -version = "5.2.14" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "asgiref" }, - { name = "sqlparse" }, - { name = "tzdata", marker = "sys_platform == 'win32'" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/65/95/95f7faa0950867afaa0bef2460c6263afd6a2c78cc9434046ed28160b015/django-5.2.14.tar.gz", hash = "sha256:58a63ba841662e5c686b57ba1fec52ddd68c0b93bd96ac3029d55728f00bf8a2", size = 10895118, upload-time = "2026-05-05T13:57:31.104Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/14/44/f172870cf87aa25afef48fb72adba89ee8b77fcab6f3b23d240b923f1528/django-5.2.14-py3-none-any.whl", hash = "sha256:6f712143bd3064310d1f50fac859c3e9a274bdcfc9595339853be7779297fc76", size = 8311320, upload-time = "2026-05-05T13:57:25.795Z" }, -] - -[[package]] -name = "django-cors-headers" -version = "4.9.0" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "asgiref" }, - { name = "django" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/21/39/55822b15b7ec87410f34cd16ce04065ff390e50f9e29f31d6d116fc80456/django_cors_headers-4.9.0.tar.gz", hash = "sha256:fe5d7cb59fdc2c8c646ce84b727ac2bca8912a247e6e68e1fb507372178e59e8", size = 21458, upload-time = "2025-09-18T10:40:52.326Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/30/d8/19ed1e47badf477d17fb177c1c19b5a21da0fd2d9f093f23be3fb86c5fab/django_cors_headers-4.9.0-py3-none-any.whl", hash = "sha256:15c7f20727f90044dcee2216a9fd7303741a864865f0c3657e28b7056f61b449", size = 12809, upload-time = "2025-09-18T10:40:50.843Z" }, -] - -[[package]] -name = "django-filter" -version = "24.3" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "django" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/50/bc/dc19ae39c235332926dd0efe0951f663fa1a9fc6be8430737ff7fd566b20/django_filter-24.3.tar.gz", hash = "sha256:d8ccaf6732afd21ca0542f6733b11591030fa98669f8d15599b358e24a2cd9c3", size = 144444, upload-time = "2024-08-02T13:27:58.132Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/09/b1/92f1c30b47c1ebf510c35a2ccad9448f73437e5891bbd2b4febe357cc3de/django_filter-24.3-py3-none-any.whl", hash = "sha256:c4852822928ce17fb699bcfccd644b3574f1a2d80aeb2b4ff4f16b02dd49dc64", size = 95011, upload-time = "2024-08-02T13:27:55.616Z" }, -] - -[[package]] -name = "djangorestframework" -version = "3.17.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "django" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/ca/d7/c016e69fac19ff8afdc89db9d31d9ae43ae031e4d1993b20aca179b8301a/djangorestframework-3.17.1.tar.gz", hash = "sha256:a6def5f447fe78ff853bff1d47a3c59bf38f5434b031780b351b0c73a62db1a5", size = 905742, upload-time = "2026-03-24T16:58:33.705Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/5a/e1/2c516bdc83652b1a60c6119366ac2c0607b479ed05cd6093f916ca8928f8/djangorestframework-3.17.1-py3-none-any.whl", hash = "sha256:c3c74dd3e83a5a3efc37b3c18d92bd6f86a6791c7b7d4dff62bb068500e76457", size = 898844, upload-time = "2026-03-24T16:58:31.845Z" }, -] - -[[package]] -name = "psycopg2-binary" -version = "2.9.12" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/2a/60/a3624f79acea344c16fbef3a94d28b89a8042ddfb8f3e4ca83f538671409/psycopg2_binary-2.9.12.tar.gz", hash = "sha256:5ac9444edc768c02a6b6a591f070b8aae28ff3a99be57560ac996001580f294c", size = 379686, upload-time = "2026-04-21T09:40:34.304Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/e2/9f/ef4ef3c8e15083df90ca35265cfd1a081a2f0cc07bb229c6314c6af817f4/psycopg2_binary-2.9.12-cp312-cp312-macosx_10_13_x86_64.whl", hash = "sha256:5cdc05117180c5fa9c40eea8ea559ce64d73824c39d928b7da9fb5f6a9392433", size = 3712459, upload-time = "2026-04-20T23:34:30.549Z" }, - { url = "https://files.pythonhosted.org/packages/b5/01/3dd14e46ba48c1e1a6ec58ee599fa1b5efa00c246d5046cd903d0eeb1af1/psycopg2_binary-2.9.12-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:d3227a3bc228c10d21011a99245edca923e4e8bf461857e869a507d9a41fe9f6", size = 3822936, upload-time = "2026-04-20T23:34:32.77Z" }, - { url = "https://files.pythonhosted.org/packages/a6/f7/0640e4901119d8a9f7a1784b927f494e2198e213ceb593753d1f2c8b1b30/psycopg2_binary-2.9.12-cp312-cp312-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:995ce929eede89db6254b50827e2b7fd61e50d11f0b116b29fffe4a2e53c4580", size = 4578676, upload-time = "2026-04-20T23:34:35.18Z" }, - { url = "https://files.pythonhosted.org/packages/b0/55/44df3965b5f297c50cc0b1b594a31c67d6127a9d133045b8a66611b14dfb/psycopg2_binary-2.9.12-cp312-cp312-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:9fe06d93e72f1c048e731a2e3e7854a5bfaa58fc736068df90b352cefe66f03f", size = 4274917, upload-time = "2026-04-20T23:34:37.982Z" }, - { url = "https://files.pythonhosted.org/packages/b0/4b/74535248b1eac0c9336862e8617c765ac94dac76f9e25d7c4a79588c8907/psycopg2_binary-2.9.12-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:40e7b28b63aaf737cb3a1edc3a9bbc9a9f4ad3dcb7152e8c1130e4050eddcb7d", size = 5894843, upload-time = "2026-04-20T23:34:40.856Z" }, - { url = "https://files.pythonhosted.org/packages/f2/ba/f1bf8d2ae71868ad800b661099086ee52bc0f8d9f05be1acd8ebb06757cc/psycopg2_binary-2.9.12-cp312-cp312-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:89d19a9f7899e8eb0656a2b3a08e0da04c720a06db6e0033eab5928aabe60fa9", size = 4110556, upload-time = "2026-04-20T23:34:44.016Z" }, - { url = "https://files.pythonhosted.org/packages/45/46/c15706c338403b7c420bcc0c2905aad116cc064545686d8bf85f1999ea00/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_aarch64.whl", hash = "sha256:612b965daee295ae2da8f8218ce1d274645dc76ef3f1abf6a0a94fd57eff876d", size = 3655714, upload-time = "2026-04-20T23:34:46.233Z" }, - { url = "https://files.pythonhosted.org/packages/b3/7c/a2d5dc09b64a4564db242a0fe418fde7d33f6f8259dd2c5b9d7def00fb5a/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_ppc64le.whl", hash = "sha256:b9a339b79d37c1b45f3235265f07cdeb0cb5ad7acd2ac7720a5920989c17c24e", size = 3301154, upload-time = "2026-04-20T23:34:49.528Z" }, - { url = "https://files.pythonhosted.org/packages/c0/e8/cc8c9a4ce71461f9ec548d38cadc41dc184b34c73e6455450775a9334ccd/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_riscv64.whl", hash = "sha256:3471336e1acfd9c7fe507b8bad5af9317b6a89294f9eb37bd9a030bb7bebcdc6", size = 3048882, upload-time = "2026-04-20T23:34:51.86Z" }, - { url = "https://files.pythonhosted.org/packages/19/6a/31e2296bc0787c5ab75d3d118e40b239db8151b5192b90b77c72bc9256e9/psycopg2_binary-2.9.12-cp312-cp312-musllinux_1_2_x86_64.whl", hash = "sha256:7af18183109e23502c8b2ae7f6926c0882766f35b5175a4cd737ad825e4d7a1b", size = 3351298, upload-time = "2026-04-20T23:34:54.124Z" }, - { url = "https://files.pythonhosted.org/packages/5f/a8/75f4e3e11203b590150abed2cf7794b9c9c9f7eceddae955191138b44dde/psycopg2_binary-2.9.12-cp312-cp312-win_amd64.whl", hash = "sha256:398fcd4db988c7d7d3713e2b8e18939776fd3fb447052daae4f24fa39daede4c", size = 2757230, upload-time = "2026-04-20T23:34:56.242Z" }, - { url = "https://files.pythonhosted.org/packages/91/bb/4608c96f970f6e0c56572e87027ef4404f709382a3503e9934526d7ba051/psycopg2_binary-2.9.12-cp313-cp313-macosx_10_13_x86_64.whl", hash = "sha256:7c729a73c7b1b84de3582f73cdd27d905121dc2c531f3d9a3c32a3011033b965", size = 3712419, upload-time = "2026-04-20T23:34:58.754Z" }, - { url = "https://files.pythonhosted.org/packages/5e/af/48f76af9d50d61cf390f8cd657b503168b089e2e9298e48465d029fcc713/psycopg2_binary-2.9.12-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:4413d0caef93c5cf50b96863df4c2efe8c269bf2267df353225595e7e15e8df7", size = 3822990, upload-time = "2026-04-20T23:35:00.821Z" }, - { url = "https://files.pythonhosted.org/packages/7a/df/aba0f99397cd811d32e06fc0cc781f1f3ce98bc0e729cb423925085d781a/psycopg2_binary-2.9.12-cp313-cp313-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:4dfcf8e45ebb0c663be34a3442f65e17311f3367089cd4e5e3a3e8e62c978777", size = 4578696, upload-time = "2026-04-20T23:35:03.409Z" }, - { url = "https://files.pythonhosted.org/packages/95/9c/eaa74021ac4e4d5c2f83d82fc6615a63f4fe6c94dc4e94c3990427053f67/psycopg2_binary-2.9.12-cp313-cp313-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:c41321a14dd74aceb6a9a643b9253a334521babfa763fa873e33d89cfa122fb5", size = 4274982, upload-time = "2026-04-20T23:35:05.583Z" }, - { url = "https://files.pythonhosted.org/packages/35/ed/c25deff98bd26187ba48b3b250a3ffc3037c46c5b89362534a15d200e0db/psycopg2_binary-2.9.12-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:83946ba43979ebfdc99a3cd0ee775c89f221df026984ba19d46133d8d75d3cd9", size = 5894867, upload-time = "2026-04-20T23:35:07.902Z" }, - { url = "https://files.pythonhosted.org/packages/9a/81/8d0e21ca77373c6c9589e5c4528f6e8f0c08c62cafc76fb0bddb7a2cee22/psycopg2_binary-2.9.12-cp313-cp313-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:411e85815652d13560fbe731878daa5d92378c4995a22302071890ec3397d019", size = 4110578, upload-time = "2026-04-20T23:35:10.149Z" }, - { url = "https://files.pythonhosted.org/packages/00/fc/f481e2435bd8f742d0123309174aae4165160ad3ef17c1b99c3622c241d2/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_aarch64.whl", hash = "sha256:1c8ad4c08e00f7679559eaed7aff1edfffc60c086b976f93972f686384a95e2c", size = 3655816, upload-time = "2026-04-20T23:35:12.56Z" }, - { url = "https://files.pythonhosted.org/packages/53/79/b9f46466bdbe9f239c96cde8be33c1aace4842f06013b47b730dc9759187/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_ppc64le.whl", hash = "sha256:00814e40fa23c2b37ef0a1e3c749d89982c73a9cb5046137f0752a22d432e82f", size = 3301307, upload-time = "2026-04-20T23:35:15.029Z" }, - { url = "https://files.pythonhosted.org/packages/3f/19/7dc003b32fe35024df89b658104f7c8538a8b2dcbde7a4e746ce929742e7/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_riscv64.whl", hash = "sha256:98062447aebc20ed20add1f547a364fd0ef8933640d5372ff1873f8deb9b61be", size = 3048968, upload-time = "2026-04-20T23:35:16.757Z" }, - { url = "https://files.pythonhosted.org/packages/91/58/2dbd7db5c604d45f4950d988506aae672a14126ec22998ced5021cbb76bb/psycopg2_binary-2.9.12-cp313-cp313-musllinux_1_2_x86_64.whl", hash = "sha256:66a7685d7e548f10fb4ce32fb01a7b7f4aa702134de92a292c7bd9e0d3dbd290", size = 3351369, upload-time = "2026-04-20T23:35:18.933Z" }, - { url = "https://files.pythonhosted.org/packages/42/ee/dee8dcaad07f735824de3d6563bc67119fa6c28257b17977a8d624f02fab/psycopg2_binary-2.9.12-cp313-cp313-win_amd64.whl", hash = "sha256:b6937f5fe4e180aeee87de907a2fa982ded6f7f15d7218f78a083e4e1d68f2a0", size = 2757347, upload-time = "2026-04-20T23:35:21.283Z" }, - { url = "https://files.pythonhosted.org/packages/13/1b/708c0dca874acfad6d65314271859899a79007686f3a1f74e82a2ed4b645/psycopg2_binary-2.9.12-cp314-cp314-macosx_10_15_x86_64.whl", hash = "sha256:6f3b3de8a74ef8db215f22edffb19e32dc6fa41340456de7ec99efdc8a7b3ec2", size = 3712428, upload-time = "2026-04-20T23:35:23.453Z" }, - { url = "https://files.pythonhosted.org/packages/d6/39/ddbea9d4b4de6aca9431b6ed253f530f8a02d3b8f9bcfd0dbfe2b3de6fe4/psycopg2_binary-2.9.12-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:1006fb62f0f0bc5ce256a832356c6262e91be43f5e4eb15b5eaf38079464caf2", size = 3823184, upload-time = "2026-04-20T23:35:25.92Z" }, - { url = "https://files.pythonhosted.org/packages/bf/a0/bc2fef74b106fa345567122a0659e6d94512ed7dc0131ec44c9e5aba3725/psycopg2_binary-2.9.12-cp314-cp314-manylinux2014_ppc64le.manylinux_2_17_ppc64le.whl", hash = "sha256:840066105706cd2eb29b9a1c2329620056582a4bf3e8169dec5c447042d0869f", size = 4579157, upload-time = "2026-04-20T23:35:28.542Z" }, - { url = "https://files.pythonhosted.org/packages/57/d7/d4e3b2005d3de607ca4fbb0e8742e248056e52184a6b94ebda3c1c2c329b/psycopg2_binary-2.9.12-cp314-cp314-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:863f5d12241ebe1c76a72a04c2113b6dc905f90b9cef0e9be0efd994affd9354", size = 4274970, upload-time = "2026-04-20T23:35:30.418Z" }, - { url = "https://files.pythonhosted.org/packages/2e/42/c9853f8db3967fe08bcde11f53d53b85d351750cae726ce001cb68afa9c1/psycopg2_binary-2.9.12-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl", hash = "sha256:a99eaab34a9010f1a086b126de467466620a750634d114d20455f3a824aae033", size = 5895175, upload-time = "2026-04-20T23:35:33.584Z" }, - { url = "https://files.pythonhosted.org/packages/eb/fd/b82b5601a97630308bef079f545ffec481bbbc795c2ba5ec416a01d03f60/psycopg2_binary-2.9.12-cp314-cp314-manylinux_2_38_riscv64.manylinux_2_39_riscv64.whl", hash = "sha256:ffdd7dc5463ccd61845ac37b7012d0f35a1548df9febe14f8dd549be4a0bc81e", size = 4110658, upload-time = "2026-04-20T23:35:35.638Z" }, - { url = "https://files.pythonhosted.org/packages/62/8c/32ca69b0389ef25dd22937bf9e8fbe2ce27aea20b05ded48c4ce4cb42475/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_aarch64.whl", hash = "sha256:54a0dfecab1b48731f934e06139dfe11e24219fb6d0ceb32177cf0375f14c7b5", size = 3656251, upload-time = "2026-04-20T23:35:37.854Z" }, - { url = "https://files.pythonhosted.org/packages/c4/29/96992a2b59e3b9d730fcf9612d0a387305025dc867a9fc490a9e496e074e/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_ppc64le.whl", hash = "sha256:96937c9c5d891f772430f418a7a8b4691a90c3e6b93cf72b5bd7cad8cbca32a5", size = 3301810, upload-time = "2026-04-20T23:35:39.927Z" }, - { url = "https://files.pythonhosted.org/packages/56/ad/44b06659949b243ae10112cd3b20a197f9bf3e81d5651379b9eb889bfaad/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_riscv64.whl", hash = "sha256:77b348775efd4cdab410ec6609d81ccecd1139c90265fa583a7255c8064bc03d", size = 3048977, upload-time = "2026-04-20T23:35:41.806Z" }, - { url = "https://files.pythonhosted.org/packages/1d/f2/10a1bcebadb6aa55e280e1f58975c36a7b560ea525184c7aa4064c466633/psycopg2_binary-2.9.12-cp314-cp314-musllinux_1_2_x86_64.whl", hash = "sha256:527e6342b3e44c2f0544f6b8e927d60de7f163f5723b8f1dfa7d2a84298738cd", size = 3351466, upload-time = "2026-04-20T23:35:43.993Z" }, - { url = "https://files.pythonhosted.org/packages/20/be/b732c8418ffa5bcfda002890f5dc4c869fc17db66ff11f53b17cfe44afc0/psycopg2_binary-2.9.12-cp314-cp314-win_amd64.whl", hash = "sha256:f12ae41fcafadb39b2785e64a40f9db05d6de2ac114077457e0e7c597f3af980", size = 2848762, upload-time = "2026-04-20T23:35:46.421Z" }, -] - -[[package]] -name = "pydantic" -version = "2.13.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "annotated-types" }, - { name = "pydantic-core" }, - { name = "typing-extensions" }, - { name = "typing-inspection" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/18/a5/b60d21ac674192f8ab0ba4e9fd860690f9b4a6e51ca5df118733b487d8d6/pydantic-2.13.4.tar.gz", hash = "sha256:c40756b57adaa8b1efeeced5c196f3f3b7c435f90e84ea7f443901bec8099ef6", size = 844775, upload-time = "2026-05-06T13:43:05.343Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/fd/7b/122376b1fd3c62c1ed9dc80c931ace4844b3c55407b6fb2d199377c9736f/pydantic-2.13.4-py3-none-any.whl", hash = "sha256:45a282cde31d808236fd7ea9d919b128653c8b38b393d1c4ab335c62924d9aba", size = 472262, upload-time = "2026-05-06T13:43:02.641Z" }, -] - -[[package]] -name = "pydantic-core" -version = "2.46.4" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/9d/56/921726b776ace8d8f5db44c4ef961006580d91dc52b803c489fafd1aa249/pydantic_core-2.46.4.tar.gz", hash = "sha256:62f875393d7f270851f20523dd2e29f082bcc82292d66db2b64ea71f64b6e1c1", size = 471464, upload-time = "2026-05-06T13:37:06.98Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ce/8c/af022f0af448d7747c5154288d46b5f2bc5f17366eaa0e23e9aa04d59f3b/pydantic_core-2.46.4-cp312-cp312-macosx_10_12_x86_64.whl", hash = "sha256:3245406455a5d98187ec35530fd772b1d799b26667980872c8d4614991e2c4a2", size = 2106158, upload-time = "2026-05-06T13:38:57.215Z" }, - { url = "https://files.pythonhosted.org/packages/19/95/6195171e385007300f0f5574592e467c568becce2d937a0b6804f218bc49/pydantic_core-2.46.4-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:962ccbab7b642487b1d8b7df90ef677e03134cf1fd8880bf698649b22a69371f", size = 1951724, upload-time = "2026-05-06T13:37:02.697Z" }, - { url = "https://files.pythonhosted.org/packages/8e/bc/f47d1ff9cbb1620e1b5b697eef06010035735f07820180e74178226b27b3/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:8233f2947cf85404441fd7e0085f53b10c93e0ee78611099b5c7237e36aacbf7", size = 1975742, upload-time = "2026-05-06T13:37:09.448Z" }, - { url = "https://files.pythonhosted.org/packages/5b/11/9b9a5b0306345664a2da6410877af6e8082481b5884b3ddd78d47c6013ce/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:3a233125ac121aa3ffba9a2b59edfc4a985a76092dc8279586ab4b71390875e7", size = 2052418, upload-time = "2026-05-06T13:37:38.234Z" }, - { url = "https://files.pythonhosted.org/packages/f1/b7/a65fec226f5d78fc39f4a13c4cc0c768c22b113438f60c14adc9d2865038/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:5b712b53160b79a5850310b912a5ef8e57e56947c8ad690c227f5c9d7e561712", size = 2232274, upload-time = "2026-05-06T13:38:27.753Z" }, - { url = "https://files.pythonhosted.org/packages/68/f0/92039db98b907ef49269a8271f67db9cb78ae2fc68062ef7e4e77adb5f61/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9401557acd873c3a7f3eb9383edef8ac4968f9510e340f4808d427e75667e7b4", size = 2309940, upload-time = "2026-05-06T13:38:05.353Z" }, - { url = "https://files.pythonhosted.org/packages/5f/97/2aab507d3d00ca626e8e57c1eac6a79e4e5fbcc63eb99733ff55d1717f65/pydantic_core-2.46.4-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:926c9541b14b12b1681dca8a0b75feb510b06c6341b70a8e500c2fdcff837cce", size = 2094516, upload-time = "2026-05-06T13:39:10.577Z" }, - { url = "https://files.pythonhosted.org/packages/22/37/a8aca44d40d737dde2bc05b3c6c07dff0de07ce6f82e9f3167aeaf4d5dea/pydantic_core-2.46.4-cp312-cp312-manylinux_2_31_riscv64.whl", hash = "sha256:56cb4851bcaf3d117eddcef4fe66afd750a50274b0da8e22be256d10e5611987", size = 2136854, upload-time = "2026-05-06T13:40:22.59Z" }, - { url = "https://files.pythonhosted.org/packages/24/99/fcef1b79238c06a8cbec70819ac722ba76e02bc8ada9b0fd66eba40da01b/pydantic_core-2.46.4-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:c68fcd102d71ea85c5b2dfac3f4f8476eff42a9e078fd5faefff6d145063536b", size = 2180306, upload-time = "2026-05-06T13:40:10.666Z" }, - { url = "https://files.pythonhosted.org/packages/ae/6c/fc44000918855b42779d007ae63b0532794739027b2f417321cddbc44f6a/pydantic_core-2.46.4-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:b2f69dec1725e79a012d920df1707de5caf7ed5e08f3be4435e25803efc47458", size = 2190044, upload-time = "2026-05-06T13:40:43.231Z" }, - { url = "https://files.pythonhosted.org/packages/6b/65/d9cadc9f1920d7a127ad2edba16c1db7916e59719285cd6c94600b0080ba/pydantic_core-2.46.4-cp312-cp312-musllinux_1_1_armv7l.whl", hash = "sha256:8d0820e8192167f80d88d64038e609c31452eeca865b4e1d9950a27a4609b00b", size = 2329133, upload-time = "2026-05-06T13:39:57.365Z" }, - { url = "https://files.pythonhosted.org/packages/d0/cf/c873d91679f3a30bcf5e7ac280ce5573483e72295307685120d0d5ad3416/pydantic_core-2.46.4-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:fbdb89b3e1c94a30cc5edfce477c6e6a5dc4d8f84665b455c27582f211a1c72c", size = 2374464, upload-time = "2026-05-06T13:38:06.976Z" }, - { url = "https://files.pythonhosted.org/packages/47/bd/6f2fc8188f31bf10590f1e98e7b306336161fac930a8c514cd7bd828c7dc/pydantic_core-2.46.4-cp312-cp312-win32.whl", hash = "sha256:9aa768456404a8bf48a4406685ac2bec8e72b62c69313734fa3b73cf33b3a894", size = 1974823, upload-time = "2026-05-06T13:40:47.985Z" }, - { url = "https://files.pythonhosted.org/packages/40/8c/985c1d41ea1107c2534abd9870e4ed5c8e7669b5c308297835c001e7a1c4/pydantic_core-2.46.4-cp312-cp312-win_amd64.whl", hash = "sha256:e9c26f834c65f5752f3f06cb08cb86a913ceb7274d0db6e267808a708b46bc89", size = 2072919, upload-time = "2026-05-06T13:39:21.153Z" }, - { url = "https://files.pythonhosted.org/packages/c4/ba/f463d006e0c47373ca7ec5e1a261c59dc01ef4d62b2657af925fb0deee3a/pydantic_core-2.46.4-cp312-cp312-win_arm64.whl", hash = "sha256:4fc73cb559bdb54b1134a706a2802a4cddd27a0633f5abb7e53056268751ac6a", size = 2027604, upload-time = "2026-05-06T13:39:03.753Z" }, - { url = "https://files.pythonhosted.org/packages/51/a2/5d30b469c5267a17b39dec53208222f76a8d351dfac4af661888c5aee77d/pydantic_core-2.46.4-cp313-cp313-macosx_10_12_x86_64.whl", hash = "sha256:5d5902252db0d3cedf8d4a1bc68f70eeb430f7e4c7104c8c476753519b423008", size = 2106306, upload-time = "2026-05-06T13:37:48.029Z" }, - { url = "https://files.pythonhosted.org/packages/c1/81/4fa520eaffa8bd7d1525e644cd6d39e7d60b1592bc5b516693c7340b50f1/pydantic_core-2.46.4-cp313-cp313-macosx_11_0_arm64.whl", hash = "sha256:c94f0688e7b8d0a67abf40e57a7eaaecd17cc9586706a31b76c031f63df052b4", size = 1951906, upload-time = "2026-05-06T13:37:17.012Z" }, - { url = "https://files.pythonhosted.org/packages/03/d5/fd02da45b659668b05923b17ba3a0100a0a3d5541e3bd8fcc4ecb711309e/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f027324c56cd5406ca49c124b0db10e56c69064fec039acc571c29020cc87c76", size = 1976802, upload-time = "2026-05-06T13:37:35.113Z" }, - { url = "https://files.pythonhosted.org/packages/21/f2/95727e1368be3d3ed485eaab7adbd7dda408f33f7a36e8b48e0144002b91/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:e739fee756ba1010f8bcccb534252e85a35fe45ae92c295a06059ce58b74ccd3", size = 2052446, upload-time = "2026-05-06T13:37:12.313Z" }, - { url = "https://files.pythonhosted.org/packages/9c/86/5d99feea3f77c7234b8718075b23db11532773c1a0dbd9b9490215dc2eeb/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:9d56801be94b86a9da183e5f3766e6310752b99ff647e38b09a9500d88e46e76", size = 2232757, upload-time = "2026-05-06T13:39:01.149Z" }, - { url = "https://files.pythonhosted.org/packages/d2/3a/508ac615935ef7588cf6d9e9b91309fdc2da751af865e02a9098de88258c/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:2412e734dcb48da14d4e4006b82b46b74f2518b8a26ee7e58c6844a6cd6d03c4", size = 2309275, upload-time = "2026-05-06T13:37:41.406Z" }, - { url = "https://files.pythonhosted.org/packages/07/f8/41db9de19d7987d6b04715a02b3b40aea467000275d9d758ffaa31af7d50/pydantic_core-2.46.4-cp313-cp313-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9551187363ffc0de2a00b2e47c25aeaeb1020b69b668762966df15fc5659dd5a", size = 2094467, upload-time = "2026-05-06T13:39:18.847Z" }, - { url = "https://files.pythonhosted.org/packages/2c/e2/f35033184cb11d0052daf4416e8e10a502ea2ac006fc4f459aee872727d1/pydantic_core-2.46.4-cp313-cp313-manylinux_2_31_riscv64.whl", hash = "sha256:0186750b482eefa11d7f435892b09c5c606193ef3375bcf94aa00ae6bfb66262", size = 2134417, upload-time = "2026-05-06T13:40:17.944Z" }, - { url = "https://files.pythonhosted.org/packages/7e/7b/6ceeb1cc90e193862f444ebe373d8fdf613f0a82572dde03fb10734c6c71/pydantic_core-2.46.4-cp313-cp313-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:5855698a4856556d86e8e6cd8434bc3ac0314ee8e12089ae0e143f64c6256e4e", size = 2179782, upload-time = "2026-05-06T13:40:32.618Z" }, - { url = "https://files.pythonhosted.org/packages/5a/f2/c8d7773ede6af08036423a00ae0ceffce266c3c52a096c435d68c896083f/pydantic_core-2.46.4-cp313-cp313-musllinux_1_1_aarch64.whl", hash = "sha256:cbaf13819775b7f769bf4a1f066cb6df7a28d4480081a589828ef190226881cd", size = 2188782, upload-time = "2026-05-06T13:36:51.018Z" }, - { url = "https://files.pythonhosted.org/packages/59/31/0c864784e31f09f05cdd87606f08923b9c9e7f6e51dd27f20f62f975ce9f/pydantic_core-2.46.4-cp313-cp313-musllinux_1_1_armv7l.whl", hash = "sha256:633147d34cf4550417f12e2b1a0383973bdf5cdfde212cb09e9a581cf10820be", size = 2328334, upload-time = "2026-05-06T13:40:37.764Z" }, - { url = "https://files.pythonhosted.org/packages/c2/eb/4f6c8a41efa30baa755590f4141abf3a8c370fab610915733e74134a7270/pydantic_core-2.46.4-cp313-cp313-musllinux_1_1_x86_64.whl", hash = "sha256:82cf5301172168103724d49a1444d3378cb20cdee30b116a1bd6031236298a5d", size = 2372986, upload-time = "2026-05-06T13:39:34.152Z" }, - { url = "https://files.pythonhosted.org/packages/5b/24/b375a480d53113860c299764bfe9f349a3dc9108b3adc0d7f0d786492ebf/pydantic_core-2.46.4-cp313-cp313-win32.whl", hash = "sha256:9fa8ae11da9e2b3126c6426f147e0fba88d96d65921799bb30c6abd1cb2c97fb", size = 1973693, upload-time = "2026-05-06T13:37:55.072Z" }, - { url = "https://files.pythonhosted.org/packages/7e/e8/cff247591966f2d22ec8c003cd7587e27b7ba7b81ab2fb888e3ab75dc285/pydantic_core-2.46.4-cp313-cp313-win_amd64.whl", hash = "sha256:6b3ace8194b0e5204818c92802dcdca7fc6d88aabbb799d7c795540d9cd6d292", size = 2071819, upload-time = "2026-05-06T13:38:49.139Z" }, - { url = "https://files.pythonhosted.org/packages/c6/1a/f4aee670d5670e9e148e0c82c7db98d780be566c6e6a97ee8035528ca0b3/pydantic_core-2.46.4-cp313-cp313-win_arm64.whl", hash = "sha256:184c081504d17f1c1066e430e117142b2c77d9448a97f7b65c6ac9fd9aee238d", size = 2027411, upload-time = "2026-05-06T13:40:45.796Z" }, - { url = "https://files.pythonhosted.org/packages/8d/74/228a26ddad29c6672b805d9fd78e8d251cd04004fa7eed0e622096cd0250/pydantic_core-2.46.4-cp314-cp314-macosx_10_12_x86_64.whl", hash = "sha256:428e04521a40150c85216fc8b85e8d39fece235a9cf5e383761238c7fa9b96fb", size = 2102079, upload-time = "2026-05-06T13:38:41.019Z" }, - { url = "https://files.pythonhosted.org/packages/ad/1f/8970b150a4b4365623ae00fc88603491f763c627311ae8031e3111356d6e/pydantic_core-2.46.4-cp314-cp314-macosx_11_0_arm64.whl", hash = "sha256:23ace664830ee0bfe014a0c7bc248b1f7f25ed7ad103852c317624a1083af462", size = 1952179, upload-time = "2026-05-06T13:36:59.812Z" }, - { url = "https://files.pythonhosted.org/packages/95/30/5211a831ae054928054b2f79731661087a2bc5c01e825c672b3a4a8f1b3e/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce5c1d2a8b27468f433ca974829c44060b8097eedc39933e3c206a90ee49c4a9", size = 1978926, upload-time = "2026-05-06T13:37:39.933Z" }, - { url = "https://files.pythonhosted.org/packages/57/e9/689668733b1eb67adeef047db3c2e8788fcf65a7fd9c9e2b46b7744fe245/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:7283d57845ecf5a163403eb0702dfc220cc4fbdd18919cb5ccea4f95ee1cdab4", size = 2046785, upload-time = "2026-05-06T13:38:01.995Z" }, - { url = "https://files.pythonhosted.org/packages/60/d9/6715260422ff50a2109878fd24d948a6c3446bb2664f34ee78cd972b3acd/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:8daafc69c93ee8a0204506a3b6b30f586ef54028f52aeeeb5c4cfc5184fd5914", size = 2228733, upload-time = "2026-05-06T13:40:50.371Z" }, - { url = "https://files.pythonhosted.org/packages/18/ae/fdb2f64316afca925640f8e70bb1a564b0ec2721c1389e25b8eb4bf9a299/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cd2213145bcc2ba85884d0ac63d222fece9209678f77b9b4d76f054c561adb28", size = 2307534, upload-time = "2026-05-06T13:37:21.531Z" }, - { url = "https://files.pythonhosted.org/packages/89/1d/8eff589b45bb8190a9d12c49cfad0f176a5cbd1534908a6b5125e2886239/pydantic_core-2.46.4-cp314-cp314-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7a5f930472650a82629163023e630d160863fce524c616f4e5186e5de9d9a49b", size = 2099732, upload-time = "2026-05-06T13:39:31.942Z" }, - { url = "https://files.pythonhosted.org/packages/06/d5/ee5a3366637fee41dee51a1fc91562dcf12ddbc68fda34e6b253da2324bb/pydantic_core-2.46.4-cp314-cp314-manylinux_2_31_riscv64.whl", hash = "sha256:c1b3f518abeca3aa13c712fd202306e145abf59a18b094a6bafb2d2bbf59192c", size = 2129627, upload-time = "2026-05-06T13:37:25.033Z" }, - { url = "https://files.pythonhosted.org/packages/94/33/2414be571d2c6a6c4d08be21f9292b6d3fdb08949a97b6dfe985017821db/pydantic_core-2.46.4-cp314-cp314-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:1a7dd0b3ee80d90150e3495a3a13ac34dbcbfd4f012996a6a1d8900e91b5c0fb", size = 2179141, upload-time = "2026-05-06T13:37:14.046Z" }, - { url = "https://files.pythonhosted.org/packages/7b/79/7daa95be995be0eecc4cf75064cb33f9bbbfe3fe0158caf2f0d4a996a5c7/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_aarch64.whl", hash = "sha256:3fb702cd90b0446a3a1c5e470bfa0dd23c0233b676a9099ddcc964fa6ca13898", size = 2184325, upload-time = "2026-05-06T13:36:53.615Z" }, - { url = "https://files.pythonhosted.org/packages/9f/cb/d0a382f5c0de8a222dc61c65348e0ce831b1f68e0a018450d31c2cace3a5/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_armv7l.whl", hash = "sha256:b8458003118a712e66286df6a707db01c52c0f52f7db8e4a38f0da1d3b94fc4e", size = 2323990, upload-time = "2026-05-06T13:40:29.971Z" }, - { url = "https://files.pythonhosted.org/packages/05/db/d9ba624cc4a5aced1598e88c04fdbd8310c8a69b9d38b9a3d39ce3a61ed7/pydantic_core-2.46.4-cp314-cp314-musllinux_1_1_x86_64.whl", hash = "sha256:372429a130e469c9cd698925ce5fc50940b7a1336b0d82038e63d5bbc4edc519", size = 2369978, upload-time = "2026-05-06T13:37:23.027Z" }, - { url = "https://files.pythonhosted.org/packages/f2/20/d15df15ba918c423461905802bfd2981c3af0bfa0e40d05e13edbfa48bc3/pydantic_core-2.46.4-cp314-cp314-win32.whl", hash = "sha256:85bb3611ff1802f3ee7fdd7dbff26b56f343fb432d57a4728fdd49b6ef35e2f4", size = 1966354, upload-time = "2026-05-06T13:38:03.499Z" }, - { url = "https://files.pythonhosted.org/packages/fc/b6/6b8de4c0a7d7ab3004c439c80c5c1e0a3e8d78bbae19379b01960383d9e5/pydantic_core-2.46.4-cp314-cp314-win_amd64.whl", hash = "sha256:811ff8e9c313ab425368bcbb36e5c4ebd7108c2bbf4e4089cfbb0b01eff63fac", size = 2072238, upload-time = "2026-05-06T13:39:40.807Z" }, - { url = "https://files.pythonhosted.org/packages/32/36/51eb763beec1f4cf59b1db243a7dcc39cbb41230f050a09b9d69faaf0a48/pydantic_core-2.46.4-cp314-cp314-win_arm64.whl", hash = "sha256:bfec22eab3c8cc2ceec0248aec886624116dc079afa027ecc8ad4a7e62010f8a", size = 2018251, upload-time = "2026-05-06T13:37:26.72Z" }, - { url = "https://files.pythonhosted.org/packages/e8/91/855af51d625b23aa987116a19e231d2aaef9c4a415273ddc189b79a45fee/pydantic_core-2.46.4-cp314-cp314t-macosx_10_12_x86_64.whl", hash = "sha256:af8244b2bef6aaad6d92cda81372de7f8c8d36c9f0c3ea36e827c60e7d9467a0", size = 2099593, upload-time = "2026-05-06T13:39:47.682Z" }, - { url = "https://files.pythonhosted.org/packages/fb/1b/8784a54c65edb5f49f0a14d6977cf1b209bba85a4c77445b255c2de58ab3/pydantic_core-2.46.4-cp314-cp314t-macosx_11_0_arm64.whl", hash = "sha256:5a4330cdbc57162e4b3aa303f588ba752257694c9c9be3e7ebb11b4aca659b5d", size = 1935226, upload-time = "2026-05-06T13:40:40.428Z" }, - { url = "https://files.pythonhosted.org/packages/e8/e7/1955d28d1afc56dd4b3ad7cc0cf39df1b9852964cf16e5d13912756d6d6b/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:29c61fc04a3d840155ff08e475a04809278972fe6aef51e2720554e96367e34b", size = 1974605, upload-time = "2026-05-06T13:37:32.029Z" }, - { url = "https://files.pythonhosted.org/packages/93/e2/3fedbf0ba7a22850e6e9fd78117f1c0f10f950182344d8a6c535d468fdd8/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_armv7l.manylinux2014_armv7l.whl", hash = "sha256:c50f2528cf200c5eed56faf3f4e22fcd5f38c157a8b78576e6ba3168ec35f000", size = 2030777, upload-time = "2026-05-06T13:38:55.239Z" }, - { url = "https://files.pythonhosted.org/packages/f8/61/46be275fcaaba0b4f5b9669dd852267ce1ff616592dccf7a7845588df091/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:0cbe8b01f948de4286c74cdd6c667aceb38f5c1e26f0693b3983d9d74887c65e", size = 2236641, upload-time = "2026-05-06T13:37:08.096Z" }, - { url = "https://files.pythonhosted.org/packages/60/db/12e93e46a8bac9988be3c016860f83293daea8c716c029c9ace279036f2f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:617d7e2ca7dcb8c5cf6bcb8c59b8832c94b36196bbf1cbd1bfb56ed341905edd", size = 2286404, upload-time = "2026-05-06T13:40:20.221Z" }, - { url = "https://files.pythonhosted.org/packages/e2/4a/4d8b19008f38d31c53b8219cfedc2e3d5de5fe99d90076b7e767de29274f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7027560ee92211647d0d34e3f7cd6f50da56399d26a9c8ad0da286d3869a53f3", size = 2109219, upload-time = "2026-05-06T13:38:12.153Z" }, - { url = "https://files.pythonhosted.org/packages/88/70/3cbc40978fefb7bb09c6708d40d4ad1a5d70fd7213c3d17f971de868ec1f/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_31_riscv64.whl", hash = "sha256:f99626688942fb746e545232e7726926f3be91b5975f8b55327665fafda991c7", size = 2110594, upload-time = "2026-05-06T13:40:02.971Z" }, - { url = "https://files.pythonhosted.org/packages/9d/20/b8d36736216e29491125531685b2f9e61aa5b4b2599893f8268551da3338/pydantic_core-2.46.4-cp314-cp314t-manylinux_2_5_i686.manylinux1_i686.whl", hash = "sha256:fc3e9034a63de20e15e8ade85358bc6efc614008cab72898b4b4952bea0509ff", size = 2159542, upload-time = "2026-05-06T13:39:27.506Z" }, - { url = "https://files.pythonhosted.org/packages/1d/a2/367df868eb584dacf6bf82a389272406d7178e301c4ac82545ab98bc2dd9/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_aarch64.whl", hash = "sha256:97e7cf2be5c77b7d1a9713a05605d49460d02c6078d38d8bef3cbe323c548424", size = 2168146, upload-time = "2026-05-06T13:38:31.93Z" }, - { url = "https://files.pythonhosted.org/packages/c1/b8/4460f77f7e201893f649a29ab355dddd3beee8a97bcb1a320db414f9a06e/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_armv7l.whl", hash = "sha256:3bf92c5d0e00fefaab325a4d27828fe6b6e2a21848686b5b60d2d9eeb09d76c6", size = 2306309, upload-time = "2026-05-06T13:37:44.717Z" }, - { url = "https://files.pythonhosted.org/packages/64/c4/be2639293acd87dc8ddbcec41a73cee9b2ebf996fe6d892a1a74e88ad3f7/pydantic_core-2.46.4-cp314-cp314t-musllinux_1_1_x86_64.whl", hash = "sha256:3ecbc122d18468d06ca279dc26a8c2e2d5acb10943bb35e36ae92096dc3b5565", size = 2369736, upload-time = "2026-05-06T13:37:05.645Z" }, - { url = "https://files.pythonhosted.org/packages/30/a6/9f9f380dbb301f67023bf8f707aaa75daadf84f7152d95c410fd7e81d994/pydantic_core-2.46.4-cp314-cp314t-win32.whl", hash = "sha256:e846ae7835bf0703ae43f534ab79a867146dadd59dc9ca5c8b53d5c8f7c9ef02", size = 1955575, upload-time = "2026-05-06T13:38:51.116Z" }, - { url = "https://files.pythonhosted.org/packages/40/1f/f1eb9eb350e795d1af8586289746f5c5677d16043040d63710e22abc43c9/pydantic_core-2.46.4-cp314-cp314t-win_amd64.whl", hash = "sha256:2108ba5c1c1eca18030634489dc544844144ee36357f2f9f780b93e7ddbb44b5", size = 2051624, upload-time = "2026-05-06T13:38:21.672Z" }, - { url = "https://files.pythonhosted.org/packages/f6/d2/42dd53d0a85c27606f316d3aa5d2869c4e8470a5ed6dec30e4a1abe19192/pydantic_core-2.46.4-cp314-cp314t-win_arm64.whl", hash = "sha256:4fcbe087dbc2068af7eda3aa87634eba216dbda64d1ae73c8684b621d33f6596", size = 2017325, upload-time = "2026-05-06T13:40:52.723Z" }, - { url = "https://files.pythonhosted.org/packages/9d/1d/8987ad40f65ae1432753072f214fb5c74fe47ffbd0698bb9cbbb585664f8/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-macosx_10_12_x86_64.whl", hash = "sha256:1d8ba486450b14f3b1d63bc521d410ec7565e52f887b9fb671791886436a42f7", size = 2095527, upload-time = "2026-05-06T13:39:52.283Z" }, - { url = "https://files.pythonhosted.org/packages/64/d3/84c282a7eee1d3ac4c0377546ef5a1ea436ce26840d9ac3b7ed54a377507/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-macosx_11_0_arm64.whl", hash = "sha256:3009f12e4e90b7f88b4f9adb1b0c4a3d58fe7820f3238c190047209d148026df", size = 1936024, upload-time = "2026-05-06T13:40:15.671Z" }, - { url = "https://files.pythonhosted.org/packages/d7/ca/eac61596cdeb4d7e174d3dc0bd8a6238f14f75f97a24e7b7db4c7e7340a0/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ad785e92e6dc634c21555edc8bd6b64957ab844541bcb96a1366c202951ae526", size = 1990696, upload-time = "2026-05-06T13:38:34.717Z" }, - { url = "https://files.pythonhosted.org/packages/fa/c3/7c8b240552251faf6b3a957db200fcfbbcec36763c050428b601e0c9b83b/pydantic_core-2.46.4-graalpy312-graalpy250_312_native-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:00c603d540afdd6b80eb39f078f33ebd46211f02f33e34a32d9f053bba711de0", size = 2147590, upload-time = "2026-05-06T13:39:29.883Z" }, -] - -[[package]] -name = "pydantic-settings" -version = "2.14.1" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "pydantic" }, - { name = "python-dotenv" }, - { name = "typing-inspection" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/07/60/1d1e59c9c90d54591469ada7d268251f71c24bdb765f1a8a832cee8c6653/pydantic_settings-2.14.1.tar.gz", hash = "sha256:e874d3bec7e787b0c9958277956ed9b4dd5de6a80e162188fdaff7c5e26fd5fa", size = 235551, upload-time = "2026-05-08T13:40:06.542Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ae/8d/f1af3832f5e6eb13ba94ee809e72b8ecb5eef226d27ee0bef7d963d943c7/pydantic_settings-2.14.1-py3-none-any.whl", hash = "sha256:6e3c7edfd8277687cdc598f56e5cff0e9bfff0910a3749deaa8d4401c3a2b9de", size = 60964, upload-time = "2026-05-08T13:40:04.958Z" }, -] - -[[package]] -name = "python-dotenv" -version = "1.2.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/82/ed/0301aeeac3e5353ef3d94b6ec08bbcabd04a72018415dcb29e588514bba8/python_dotenv-1.2.2.tar.gz", hash = "sha256:2c371a91fbd7ba082c2c1dc1f8bf89ca22564a087c2c287cd9b662adde799cf3", size = 50135, upload-time = "2026-03-01T16:00:26.196Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/0b/d7/1959b9648791274998a9c3526f6d0ec8fd2233e4d4acce81bbae76b44b2a/python_dotenv-1.2.2-py3-none-any.whl", hash = "sha256:1d8214789a24de455a8b8bd8ae6fe3c6b69a5e3d64aa8a8e5d68e694bbcb285a", size = 22101, upload-time = "2026-03-01T16:00:25.09Z" }, -] - -[[package]] -name = "sqlparse" -version = "0.5.5" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/90/76/437d71068094df0726366574cf3432a4ed754217b436eb7429415cf2d480/sqlparse-0.5.5.tar.gz", hash = "sha256:e20d4a9b0b8585fdf63b10d30066c7c94c5d7a7ec47c889a2d83a3caa93ff28e", size = 120815, upload-time = "2025-12-19T07:17:45.073Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/49/4b/359f28a903c13438ef59ebeee215fb25da53066db67b305c125f1c6d2a25/sqlparse-0.5.5-py3-none-any.whl", hash = "sha256:12a08b3bf3eec877c519589833aed092e2444e68240a3577e8e26148acc7b1ba", size = 46138, upload-time = "2025-12-19T07:17:46.573Z" }, -] - -[[package]] -name = "typing-extensions" -version = "4.15.0" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/72/94/1a15dd82efb362ac84269196e94cf00f187f7ed21c242792a923cdb1c61f/typing_extensions-4.15.0.tar.gz", hash = "sha256:0cea48d173cc12fa28ecabc3b837ea3cf6f38c6d1136f85cbaaf598984861466", size = 109391, upload-time = "2025-08-25T13:49:26.313Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/18/67/36e9267722cc04a6b9f15c7f3441c2363321a3ea07da7ae0c0707beb2a9c/typing_extensions-4.15.0-py3-none-any.whl", hash = "sha256:f0fa19c6845758ab08074a0cfa8b7aecb71c999ca73d62883bc25cc018c4e548", size = 44614, upload-time = "2025-08-25T13:49:24.86Z" }, -] - -[[package]] -name = "typing-inspection" -version = "0.4.2" -source = { registry = "https://pypi.org/simple" } -dependencies = [ - { name = "typing-extensions" }, -] -sdist = { url = "https://files.pythonhosted.org/packages/55/e3/70399cb7dd41c10ac53367ae42139cf4b1ca5f36bb3dc6c9d33acdb43655/typing_inspection-0.4.2.tar.gz", hash = "sha256:ba561c48a67c5958007083d386c3295464928b01faa735ab8547c5692e87f464", size = 75949, upload-time = "2025-10-01T02:14:41.687Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/dc/9b/47798a6c91d8bdb567fe2698fe81e0c6b7cb7ef4d13da4114b41d239f65d/typing_inspection-0.4.2-py3-none-any.whl", hash = "sha256:4ed1cacbdc298c220f1bd249ed5287caa16f34d44ef4e9c3d0cbad5b521545e7", size = 14611, upload-time = "2025-10-01T02:14:40.154Z" }, -] - -[[package]] -name = "tzdata" -version = "2026.2" -source = { registry = "https://pypi.org/simple" } -sdist = { url = "https://files.pythonhosted.org/packages/ba/19/1b9b0e29f30c6d35cb345486df41110984ea67ae69dddbc0e8a100999493/tzdata-2026.2.tar.gz", hash = "sha256:9173fde7d80d9018e02a662e168e5a2d04f87c41ea174b139fbef642eda62d10", size = 198254, upload-time = "2026-04-24T15:22:08.651Z" } -wheels = [ - { url = "https://files.pythonhosted.org/packages/ce/e4/dccd7f47c4b64213ac01ef921a1337ee6e30e8c6466046018326977efd95/tzdata-2026.2-py2.py3-none-any.whl", hash = "sha256:bbe9af844f658da81a5f95019480da3a89415801f6cc966806612cc7169bffe7", size = 349321, upload-time = "2026-04-24T15:22:05.876Z" }, -] diff --git a/api/Dockerfile b/backend/Dockerfile similarity index 74% rename from api/Dockerfile rename to backend/Dockerfile index 67f5823..086288e 100644 --- a/api/Dockerfile +++ b/backend/Dockerfile @@ -6,10 +6,10 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ libpq-dev gcc && \ rm -rf /var/lib/apt/lists/* -COPY pyproject.toml ./ -RUN pip install uv && uv sync --frozen +COPY requirements.txt ./ +RUN pip install --no-cache-dir -r requirements.txt -COPY . . +COPY . ./ RUN mkdir -p media diff --git a/backend/apps/books/migrations/0001_initial.py b/backend/apps/books/migrations/0001_initial.py new file mode 100644 index 0000000..47dbbeb --- /dev/null +++ b/backend/apps/books/migrations/0001_initial.py @@ -0,0 +1,96 @@ +# Generated by Django 5.1.7 on 2026-05-26 03:33 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='Book', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(db_index=True, max_length=512)), + ('author', models.CharField(blank=True, db_index=True, default='', max_length=256)), + ('genre', models.CharField(blank=True, db_index=True, default='', max_length=128)), + ('description', models.TextField(blank=True, default='')), + ('reading_status', models.CharField(choices=[('want_to_read', 'Want to Read'), ('reading', 'Reading'), ('finished', 'Finished'), ('dnf', 'Did Not Finish')], db_index=True, default='want_to_read', max_length=20)), + ('total_pages', models.PositiveIntegerField(default=0)), + ('cover_image', models.URLField(blank=True, default='')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ], + options={ + 'verbose_name': 'Book', + 'verbose_name_plural': 'Books', + 'db_table': 'books_book', + 'ordering': ['title'], + 'indexes': [models.Index(fields=['title', 'author', 'genre'], name='books_book_title_9fddc2_idx')], + }, + ), + migrations.CreateModel( + name='EBook', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('title', models.CharField(max_length=512)), + ('author', models.CharField(blank=True, default='', max_length=256)), + ('file', models.FileField(upload_to='ebooks/%Y/%m/%d/')), + ('cover_image', models.ImageField(blank=True, null=True, upload_to='ebook_covers/%Y/%m/%d/')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ebooks', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name': 'E-Book', + 'verbose_name_plural': 'E-Books', + 'db_table': 'books_ebook', + 'ordering': ['-created_at'], + }, + ), + migrations.CreateModel( + name='ReadingProgress', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('current_position', models.FloatField(default=0.0)), + ('last_page', models.IntegerField(default=0)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('ebook', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='reading_progress', to='books.ebook')), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reading_progress', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name_plural': 'reading progress', + 'db_table': 'books_reading_progress', + }, + ), + migrations.CreateModel( + name='ReadingSettings', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('font_size', models.IntegerField(default=18)), + ('font_style', models.CharField(choices=[('sans-serif', 'Sans Serif'), ('serif', 'Serif'), ('monospace', 'Monospace')], default='sans-serif', max_length=20)), + ('background_color', models.CharField(choices=[('#ffffff', 'White'), ('#f4e4c1', 'Sepia'), ('#1a1a2e', 'Dark'), ('#c7edcc', 'Green')], default='#ffffff', max_length=7)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='reading_settings', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name_plural': 'reading settings', + 'db_table': 'books_reading_settings', + }, + ), + migrations.AddIndex( + model_name='ebook', + index=models.Index(fields=['user', '-created_at'], name='books_ebook_user_id_0b6bdb_idx'), + ), + migrations.AlterUniqueTogether( + name='readingprogress', + unique_together={('user', 'ebook')}, + ), + ] diff --git a/backend/apps/books/models.py b/backend/apps/books/models.py index dedd71b..7fa651f 100644 --- a/backend/apps/books/models.py +++ b/backend/apps/books/models.py @@ -49,12 +49,8 @@ class Book(models.Model): class EBook(models.Model): user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="ebooks") - title = models.CharField(max_length=512, db_index=True) - author = models.CharField(max_length=256, blank=True, default="", db_index=True) - format = models.CharField(max_length=20, blank=True, default="", editable=False) - page_count = models.PositiveIntegerField(default=0) - file_size = models.BigIntegerField(default=0) - metadata_json = models.JSONField(blank=True, default=dict) + title = models.CharField(max_length=512) + author = models.CharField(max_length=256, blank=True, default="") file = models.FileField(upload_to="ebooks/%Y/%m/%d/") cover_image = models.ImageField(upload_to="ebook_covers/%Y/%m/%d/", blank=True, null=True) created_at = models.DateTimeField(auto_now_add=True) @@ -74,24 +70,6 @@ class EBook(models.Model): return Path(self.file.name).name if self.file else "" -class BookChapter(models.Model): - ebook = models.ForeignKey(EBook, on_delete=models.CASCADE, related_name="chapters") - title = models.CharField(max_length=512) - index = models.IntegerField(default=0) - href = models.CharField(max_length=1024, blank=True, default="") - children = models.JSONField(blank=True, default=list) - - class Meta: - db_table = "books_book_chapter" - verbose_name = "Book Chapter" - verbose_name_plural = "Book Chapters" - ordering = ["index"] - indexes = [models.Index(fields=["ebook", "index"])] - - def __str__(self): - return f"{self.ebook.title} - {self.title}" - - @receiver(post_delete, sender=EBook) def _auto_delete_ebook_file(sender, instance, **kwargs): if instance.file: @@ -100,33 +78,11 @@ def _auto_delete_ebook_file(sender, instance, **kwargs): instance.cover_image.delete(save=False) -class DownloadRecord(models.Model): - """Tracks book downloads for offline access management.""" - - user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="download_records") - ebook = models.ForeignKey(EBook, on_delete=models.CASCADE, related_name="download_records") - file_size = models.BigIntegerField(default=0) - downloaded_at = models.DateTimeField(auto_now_add=True) - - class Meta: - db_table = "books_download_record" - verbose_name = "Download Record" - verbose_name_plural = "Download Records" - ordering = ["-downloaded_at"] - unique_together = [("user", "ebook")] - - def __str__(self): - return f"{self.user} - {self.ebook.title}" - - class ReadingProgress(models.Model): user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="reading_progress") ebook = models.OneToOneField(EBook, on_delete=models.CASCADE, related_name="reading_progress") current_position = models.FloatField(default=0.0) last_page = models.IntegerField(default=0) - device_id = models.CharField(max_length=128, blank=True, default="") - device_name = models.CharField(max_length=128, blank=True, default="") - version = models.PositiveIntegerField(default=1) updated_at = models.DateTimeField(auto_now=True) class Meta: @@ -137,36 +93,6 @@ class ReadingProgress(models.Model): def __str__(self): return f"{self.ebook.title} - {self.current_position:.1f}%" - def update_with_sync(self, position: float, last_page: int, - device_id: str, device_name: str, - client_updated_at: str | None = None) -> tuple["ReadingProgress", bool]: - """Update progress with conflict resolution (last-write-wins by timestamp). - - Returns (instance, applied) where applied is True if the update was applied. - """ - if client_updated_at and self.updated_at: - try: - from django.utils.timezone import is_naive, make_aware - from datetime import datetime - client_dt = datetime.fromisoformat(client_updated_at.replace("Z", "+00:00")) - if is_naive(client_dt): - client_dt = make_aware(client_dt) - if client_dt <= self.updated_at: - return self, False - except (ValueError, TypeError): - pass - - self.current_position = position - self.last_page = last_page - self.device_id = device_id - self.device_name = device_name - self.version += 1 - self.save(update_fields=[ - "current_position", "last_page", - "device_id", "device_name", "version", "updated_at", - ]) - return self, True - class ReadingSettings(models.Model): user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="reading_settings") @@ -180,79 +106,4 @@ class ReadingSettings(models.Model): verbose_name_plural = "reading settings" def __str__(self): - return f"Settings for {self.user}" - - -class Chapter(models.Model): - """A chapter within a book, containing the text/markdown content. - - This is distinct from BookChapter (which tracks EPUB TOC entries). - Chapter represents user-authored chapter content for a Book. - """ - - book = models.ForeignKey( - Book, - on_delete=models.CASCADE, - related_name="chapters", - db_index=True, - ) - title = models.CharField(max_length=512) - number = models.PositiveIntegerField() - content = models.TextField(blank=True, default="") - created_at = models.DateTimeField(auto_now_add=True) - updated_at = models.DateTimeField(auto_now=True) - - class Meta: - db_table = "books_chapter" - verbose_name = "Chapter" - verbose_name_plural = "Chapters" - ordering = ["book", "number"] - constraints = [ - models.UniqueConstraint( - fields=["book", "number"], - name="uq_book_chapter_number", - ) - ] - - def __str__(self): - return f"{self.book.title} — Ch. {self.number}: {self.title}" - - -class BookReadingProgress(models.Model): - """Tracks a user's reading progress within a book's chapters. - - This is distinct from ReadingProgress (which tracks ebook progress). - BookReadingProgress tracks chapter-based reading for Books. - """ - - user = models.ForeignKey( - settings.AUTH_USER_MODEL, - on_delete=models.CASCADE, - related_name="book_reading_progress", - db_index=True, - ) - book = models.ForeignKey( - Book, - on_delete=models.CASCADE, - related_name="book_reading_progress", - db_index=True, - ) - current_chapter = models.PositiveIntegerField(default=1) - current_position = models.PositiveIntegerField(default=0) - percentage = models.FloatField(default=0.0) - updated_at = models.DateTimeField(auto_now=True) - - class Meta: - db_table = "books_book_reading_progress" - verbose_name = "Book Reading Progress" - verbose_name_plural = "Book Reading Progress" - ordering = ["-updated_at"] - constraints = [ - models.UniqueConstraint( - fields=["user", "book"], - name="uq_book_reading_progress_user_book", - ) - ] - - def __str__(self): - return f"{self.user} — {self.book.title} ({self.percentage:.0f}%)" \ No newline at end of file + return f"Settings for {self.user}" \ No newline at end of file diff --git a/backend/apps/books/serializers.py b/backend/apps/books/serializers.py index 2a0c6a3..f0725e4 100644 --- a/backend/apps/books/serializers.py +++ b/backend/apps/books/serializers.py @@ -1,26 +1,6 @@ from rest_framework import serializers -from apps.books.models import Book, BookChapter, BookReadingProgress, Chapter, EBook, FontStyle, BackgroundColor, ReadingProgress, ReadingSettings, ReadingStatus, DownloadRecord - - -class BookChapterSerializer(serializers.ModelSerializer): - class Meta: - model = BookChapter - fields = ["id", "title", "index", "href", "children"] - - -class EBookContentSerializer(serializers.Serializer): - page = serializers.IntegerField() - total_pages = serializers.IntegerField() - content = serializers.CharField() - chapter_title = serializers.CharField() - format = serializers.CharField() - - -class EBookTocSerializer(serializers.Serializer): - chapters = serializers.ListField(child=BookChapterSerializer()) - format = serializers.CharField() - page_count = serializers.IntegerField() +from apps.books.models import Book, EBook, FontStyle, BackgroundColor, ReadingProgress, ReadingSettings, ReadingStatus class BookListSerializer(serializers.ModelSerializer): @@ -49,12 +29,11 @@ class BookSerializer(serializers.ModelSerializer): class EBookListSerializer(serializers.ModelSerializer): filename = serializers.CharField(read_only=True) - format = serializers.CharField(read_only=True) progress = serializers.SerializerMethodField() class Meta: model = EBook - fields = ["id", "title", "author", "filename", "format", "page_count", "file_size", "cover_image", "created_at", "progress"] + fields = ["id", "title", "author", "filename", "cover_image", "created_at", "progress"] def get_progress(self, obj): try: @@ -65,13 +44,12 @@ class EBookListSerializer(serializers.ModelSerializer): class EBookDetailSerializer(serializers.ModelSerializer): filename = serializers.CharField(read_only=True) - format = serializers.CharField(read_only=True) file_url = serializers.SerializerMethodField() progress = serializers.SerializerMethodField() class Meta: model = EBook - fields = ["id", "title", "author", "filename", "format", "page_count", "file_size", "file_url", "cover_image", "created_at", "updated_at", "progress"] + fields = ["id", "title", "author", "filename", "file_url", "cover_image", "created_at", "updated_at", "progress"] def get_file_url(self, obj): request = self.context.get("request") @@ -104,20 +82,13 @@ class EBookUploadSerializer(serializers.ModelSerializer): def create(self, validated_data): validated_data["user"] = self.context["request"].user - # Auto-detect format from file extension - import os - name = str(getattr(validated_data.get("file"), "name", "")) - ext = os.path.splitext(name)[1].lower().lstrip(".") - if ext: - validated_data["format"] = ext return super().create(validated_data) class ReadingProgressSerializer(serializers.ModelSerializer): class Meta: model = ReadingProgress - fields = ["current_position", "last_page", "device_id", "device_name", "version", "updated_at"] - read_only_fields = ["version", "updated_at"] + fields = ["current_position", "last_page"] extra_kwargs = {"current_position": {"required": True, "min_value": 0.0, "max_value": 100.0}} def validate_current_position(self, value): @@ -146,83 +117,4 @@ class ReadingSettingsSerializer(serializers.ModelSerializer): valid = [c.value for c in BackgroundColor] if value not in valid: raise serializers.ValidationError(f"Background color must be one of: {', '.join(valid)}") - return value - - -class DownloadRecordSerializer(serializers.ModelSerializer): - ebook_id = serializers.IntegerField(source="ebook.id", read_only=True) - ebook_title = serializers.CharField(source="ebook.title", read_only=True) - author = serializers.CharField(source="ebook.author", read_only=True) - filename = serializers.SerializerMethodField() - cover_image = serializers.ImageField(source="ebook.cover_image", read_only=True) - format = serializers.CharField(source="ebook.format", read_only=True) - progress = serializers.SerializerMethodField() - file_url = serializers.SerializerMethodField() - - class Meta: - model = DownloadRecord - fields = [ - "id", "ebook_id", "ebook_title", "author", "filename", "file_url", - "file_size", "cover_image", "format", "downloaded_at", "progress", - ] - - def get_filename(self, obj): - return obj.ebook.filename() - - def get_file_url(self, obj): - request = self.context.get("request") - if request and obj.ebook.file: - return request.build_absolute_uri(obj.ebook.file.url) - return "" - - def get_progress(self, obj): - try: - rp = obj.ebook.reading_progress - return {"current_position": rp.current_position, "last_page": rp.last_page} - except ReadingProgress.DoesNotExist: - return None - - -class StorageSummarySerializer(serializers.Serializer): - total_downloads = serializers.IntegerField() - total_size_bytes = serializers.IntegerField() - ebooks = serializers.ListField(child=serializers.DictField()) - - -class ChapterSummarySerializer(serializers.ModelSerializer): - """Compact serializer for TOC listing — no content body.""" - - class Meta: - model = Chapter - fields = ["id", "book", "title", "number"] - - -class ChapterDetailSerializer(serializers.ModelSerializer): - """Full serializer with chapter content for reading view.""" - - class Meta: - model = Chapter - fields = ["id", "book", "title", "number", "content", "created_at", "updated_at"] - read_only_fields = ["id", "created_at", "updated_at"] - - -class BookReadingProgressSerializer(serializers.ModelSerializer): - """Serialize chapter-based reading progress for a book.""" - - class Meta: - model = BookReadingProgress - fields = [ - "id", "book", "current_chapter", "current_position", - "percentage", "updated_at", - ] - read_only_fields = ["id", "updated_at"] - - def validate_percentage(self, value): - if value < 0.0 or value > 100.0: - raise serializers.ValidationError("Percentage must be between 0 and 100.") - return value - - def validate_current_chapter(self, value): - if value < 1: - raise serializers.ValidationError("Chapter number must be positive.") return value \ No newline at end of file diff --git a/backend/apps/books/tests.py b/backend/apps/books/tests.py new file mode 100644 index 0000000..e8c39bb --- /dev/null +++ b/backend/apps/books/tests.py @@ -0,0 +1,255 @@ +"""Tests for the Book search & discovery endpoints.""" + +import pytest +from django.urls import reverse +from rest_framework import status +from rest_framework.test import APIClient + +from apps.books.models import Book, ReadingStatus + + +# --------------------------------------------------------------------------- +# Fixtures +# --------------------------------------------------------------------------- + + +@pytest.fixture +def api_client(): + return APIClient() + + +@pytest.fixture +def user(django_user_model): + return django_user_model.objects.create_user( + email="reader@example.com", + password="testpass123", + ) + + +@pytest.fixture +def auth_client(api_client, user): + api_client.force_authenticate(user=user) + return api_client + + +@pytest.fixture +def books(): + books_data = [ + Book.objects.create( + title="Dune", + author="Frank Herbert", + genre="Science Fiction", + reading_status=ReadingStatus.FINISHED, + total_pages=688, + description="A desert planet saga.", + ), + Book.objects.create( + title="Neuromancer", + author="William Gibson", + genre="Science Fiction", + reading_status=ReadingStatus.READING, + total_pages=271, + description="Cyberpunk classic.", + ), + Book.objects.create( + title="The Hobbit", + author="J.R.R. Tolkien", + genre="Fantasy", + reading_status=ReadingStatus.WANT_TO_READ, + total_pages=310, + description="A hobbit's adventure.", + ), + Book.objects.create( + title="1984", + author="George Orwell", + genre="Dystopian", + reading_status=ReadingStatus.FINISHED, + total_pages=328, + description="Big Brother is watching.", + ), + ] + return books_data + + +# --------------------------------------------------------------------------- +# Search tests +# --------------------------------------------------------------------------- + + +@pytest.mark.django_db +class TestBookSearch: + """Verify the search endpoint returns correct results.""" + + def test_search_by_title(self, auth_client, books): + url = reverse("book-list") + response = auth_client.get(url, {"q": "Dune"}) + assert response.status_code == status.HTTP_200_OK + titles = [b["title"] for b in response.data["results"]] + assert "Dune" in titles + assert "Neuromancer" not in titles + + def test_search_by_author(self, auth_client, books): + url = reverse("book-list") + response = auth_client.get(url, {"q": "Tolkien"}) + assert response.status_code == status.HTTP_200_OK + titles = [b["title"] for b in response.data["results"]] + assert "The Hobbit" in titles + + def test_search_by_genre(self, auth_client, books): + url = reverse("book-list") + response = auth_client.get(url, {"q": "Fantasy"}) + assert response.status_code == status.HTTP_200_OK + titles = [b["title"] for b in response.data["results"]] + assert "The Hobbit" in titles + + def test_search_case_insensitive(self, auth_client, books): + url = reverse("book-list") + response = auth_client.get(url, {"q": "dune"}) + assert response.status_code == status.HTTP_200_OK + assert any(b["title"] == "Dune" for b in response.data["results"]) + + def test_search_partial_match(self, auth_client, books): + url = reverse("book-list") + response = auth_client.get(url, {"q": "Neu"}) + assert response.status_code == status.HTTP_200_OK + titles = [b["title"] for b in response.data["results"]] + assert "Neuromancer" in titles + + def test_search_empty_query_returns_all(self, auth_client, books): + url = reverse("book-list") + response = auth_client.get(url, {"q": ""}) + assert response.status_code == status.HTTP_200_OK + assert len(response.data["results"]) == 4 + + def test_search_no_results(self, auth_client, books): + url = reverse("book-list") + response = auth_client.get(url, {"q": "zzzznotfound"}) + assert response.status_code == status.HTTP_200_OK + assert len(response.data["results"]) == 0 + + +# --------------------------------------------------------------------------- +# Filter tests +# --------------------------------------------------------------------------- + + +@pytest.mark.django_db +class TestBookFilters: + """Verify filters for genre, author, and reading_status.""" + + def test_filter_by_genre(self, auth_client, books): + url = reverse("book-list") + response = auth_client.get(url, {"genre": "Science Fiction"}) + assert response.status_code == status.HTTP_200_OK + titles = [b["title"] for b in response.data["results"]] + assert "Dune" in titles + assert "Neuromancer" in titles + assert "The Hobbit" not in titles + + def test_filter_by_author(self, auth_client, books): + url = reverse("book-list") + response = auth_client.get(url, {"author": "George Orwell"}) + assert response.status_code == status.HTTP_200_OK + titles = [b["title"] for b in response.data["results"]] + assert "1984" in titles + assert "Dune" not in titles + + def test_filter_by_reading_status(self, auth_client, books): + url = reverse("book-list") + response = auth_client.get(url, {"reading_status": ReadingStatus.FINISHED}) + assert response.status_code == status.HTTP_200_OK + titles = [b["title"] for b in response.data["results"]] + assert "Dune" in titles + assert "1984" in titles + assert "Neuromancer" not in titles + assert "The Hobbit" not in titles + + def test_filter_combined_with_search(self, auth_client, books): + """Search + filter should intersect results.""" + url = reverse("book-list") + response = auth_client.get(url, {"q": "Dune", "reading_status": ReadingStatus.FINISHED}) + assert response.status_code == status.HTTP_200_OK + titles = [b["title"] for b in response.data["results"]] + assert "Dune" in titles + # 1984 matches reading_status but not search + assert "1984" not in titles + + +# --------------------------------------------------------------------------- +# Discovery endpoints +# --------------------------------------------------------------------------- + + +@pytest.mark.django_db +class TestBookDiscovery: + """Verify genre and author discovery endpoints.""" + + def test_genres_endpoint(self, auth_client, books): + url = reverse("book-genres") + response = auth_client.get(url) + assert response.status_code == status.HTTP_200_OK + assert isinstance(response.data, list) + assert "Science Fiction" in response.data + assert "Fantasy" in response.data + assert "Dystopian" in response.data + # No duplicate genres + assert response.data.count("Science Fiction") == 1 + + def test_authors_endpoint(self, auth_client, books): + url = reverse("book-authors") + response = auth_client.get(url) + assert response.status_code == status.HTTP_200_OK + assert isinstance(response.data, list) + assert "Frank Herbert" in response.data + assert "J.R.R. Tolkien" in response.data + + def test_genres_requires_auth(self, api_client, books): + url = reverse("book-genres") + response = api_client.get(url) + assert response.status_code == status.HTTP_401_UNAUTHORIZED + + def test_authors_requires_auth(self, api_client, books): + url = reverse("book-authors") + response = api_client.get(url) + assert response.status_code == status.HTTP_401_UNAUTHORIZED + + +# --------------------------------------------------------------------------- +# Detail view +# --------------------------------------------------------------------------- + + +@pytest.mark.django_db +class TestBookDetail: + """Verify the book detail endpoint.""" + + def test_retrieve_book(self, auth_client, books): + book = books[0] + url = reverse("book-detail", kwargs={"pk": book.pk}) + response = auth_client.get(url) + assert response.status_code == status.HTTP_200_OK + assert response.data["title"] == "Dune" + assert response.data["author"] == "Frank Herbert" + assert response.data["description"] == "A desert planet saga." + assert response.data["total_pages"] == 688 + + def test_retrieve_nonexistent_returns_404(self, auth_client, books): + url = reverse("book-detail", kwargs={"pk": 99999}) + response = auth_client.get(url) + assert response.status_code == status.HTTP_404_NOT_FOUND + + def test_pagination(self, auth_client, books): + """List with small page size should paginate.""" + url = reverse("book-list") + response = auth_client.get(f"{url}?page_size=2") + assert response.status_code == status.HTTP_200_OK + assert "count" in response.data + assert "results" in response.data + assert response.data["count"] == 4 + + def test_ordering(self, auth_client, books): + url = reverse("book-list") + response = auth_client.get(url, {"ordering": "title"}) + assert response.status_code == status.HTTP_200_OK + titles = [b["title"] for b in response.data["results"]] + assert titles == sorted(titles) \ No newline at end of file diff --git a/backend/apps/books/urls.py b/backend/apps/books/urls.py index a95f0cd..a4d9a2f 100644 --- a/backend/apps/books/urls.py +++ b/backend/apps/books/urls.py @@ -1,11 +1,16 @@ from django.urls import include, path from rest_framework.routers import DefaultRouter -from apps.books.views import BookViewSet +from apps.books.views import BookViewSet, EBookViewSet, ReadingSettingsViewSet router = DefaultRouter() router.register(r"", BookViewSet, basename="book") +ebook_router = DefaultRouter() +ebook_router.register(r"ebooks", EBookViewSet, basename="ebook") + urlpatterns = [ path("", include(router.urls)), + path("", include(ebook_router.urls)), + path("settings/", ReadingSettingsViewSet.as_view({"get": "list", "patch": "partial_update"}), name="reading-settings"), ] \ No newline at end of file diff --git a/backend/apps/books/views.py b/backend/apps/books/views.py index 232c08c..86c0b51 100644 --- a/backend/apps/books/views.py +++ b/backend/apps/books/views.py @@ -12,13 +12,12 @@ from rest_framework.permissions import AllowAny, IsAuthenticated from rest_framework.request import Request from rest_framework.response import Response -from apps.books.models import Book, BookChapter, BookReadingProgress, DownloadRecord, EBook, Chapter, ReadingProgress, ReadingSettings +from apps.books.models import Book, BookChapter, EBook, ReadingProgress, ReadingSettings from apps.books.serializers import ( - BookChapterSerializer, BookDetailSerializer, BookListSerializer, BookSerializer, - BookReadingProgressSerializer, ChapterDetailSerializer, ChapterSummarySerializer, - DownloadRecordSerializer, EBookContentSerializer, EBookDetailSerializer, + BookDetailSerializer, BookListSerializer, BookSerializer, + BookChapterSerializer, EBookContentSerializer, EBookDetailSerializer, EBookListSerializer, EBookTocSerializer, EBookUploadSerializer, - ReadingProgressSerializer, ReadingSettingsSerializer, StorageSummarySerializer, + ReadingProgressSerializer, ReadingSettingsSerializer, ) logger = logging.getLogger(__name__) @@ -57,64 +56,6 @@ class BookViewSet(viewsets.ModelViewSet): author_list = Book.objects.values_list("author", flat=True).distinct().order_by("author") return Response([a for a in author_list if a]) - @action(detail=False, methods=["get"]) - def storage(self, request: Request) -> Response: - """Return storage usage summary for the current user.""" - download_records = DownloadRecord.objects.filter(user=request.user).select_related("ebook") - total_size = sum(r.file_size for r in download_records) - ebook_list = [ - {"id": r.ebook.id, "title": r.ebook.title, "file_size": r.file_size} - for r in download_records - ] - serializer = StorageSummarySerializer(data={ - "total_downloads": download_records.count(), - "total_size_bytes": total_size, - "ebooks": ebook_list, - }) - serializer.is_valid(raise_exception=True) - return Response(serializer.data) - - - @action(detail=True, methods=["get"]) - def chapters(self, request: Request, pk: int | None = None) -> Response: - """List all chapters for this book (TOC).""" - book = self.get_object() - chapter_qs = Chapter.objects.filter(book=book).order_by("number") - serializer = ChapterSummarySerializer(chapter_qs, many=True) - return Response(serializer.data) - - @action(detail=True, methods=["get"], url_path=r"chapters/(?P[0-9]+)") - def chapter_detail(self, request: Request, pk: int | None = None, chapter_number: str | None = None) -> Response: - """Get a specific chapter with full content.""" - book = self.get_object() - try: - chapter = Chapter.objects.get(book=book, number=int(chapter_number or "0")) - except Chapter.DoesNotExist: - return Response( - {"detail": "Chapter not found."}, status=status.HTTP_404_NOT_FOUND - ) - serializer = ChapterDetailSerializer(chapter) - return Response(serializer.data) - - @action(detail=True, methods=["get", "put"]) - def progress(self, request: Request, pk: int | None = None) -> Response: - """Get or update chapter-based reading progress for this book.""" - book = self.get_object() - progress_obj, _created = BookReadingProgress.objects.get_or_create( - user=request.user, book=book - ) - - if request.method == "GET": - serializer = BookReadingProgressSerializer(progress_obj) - return Response(serializer.data) - - serializer = BookReadingProgressSerializer( - progress_obj, data=request.data, partial=True - ) - serializer.is_valid(raise_exception=True) - serializer.save() - return Response(serializer.data, status=status.HTTP_200_OK) - class IsEBookOwner(permissions.BasePermission): def has_object_permission(self, request: Request, view: object, obj: EBook) -> bool: @@ -228,48 +169,6 @@ class EBookViewSet(viewsets.ModelViewSet): serializer.is_valid(raise_exception=True) return Response(serializer.data) - @action(detail=True, methods=["post"]) - def download(self, request: Request, pk: int | None = None) -> Response: - """Track download of an e-book. Creates a DownloadRecord and returns file info.""" - ebook = self.get_object() - if not ebook.file: - return Response({"error": "No file found for this e-book."}, status=status.HTTP_400_BAD_REQUEST) - - download, created = DownloadRecord.objects.get_or_create( - user=request.user, - ebook=ebook, - defaults={"file_size": ebook.file.size if ebook.file else 0}, - ) - if not created: - download.file_size = ebook.file.size if ebook.file else 0 - download.save(update_fields=["file_size"]) - - serializer = DownloadRecordSerializer(download, context={"request": request}) - return Response(serializer.data, status=status.HTTP_200_OK) - - @action(detail=False, methods=["get"]) - def downloads(self, request: Request) -> Response: - """List all e-books the current user has downloaded.""" - records = DownloadRecord.objects.filter(user=request.user).select_related( - "ebook", "ebook__reading_progress" - ).prefetch_related("ebook__chapters") - page = self.paginate_queryset(records) - if page is not None: - serializer = DownloadRecordSerializer(page, many=True, context={"request": request}) - return self.get_paginated_response(serializer.data) - serializer = DownloadRecordSerializer(records, many=True, context={"request": request}) - return Response(serializer.data) - - @action(detail=False, methods=["delete"], url_path="downloads/(?P[^/.]+)") - def delete_download(self, request: Request, download_pk: str | None = None) -> Response: - """Delete a download record.""" - try: - download = DownloadRecord.objects.get(pk=download_pk, user=request.user) - except DownloadRecord.DoesNotExist: - return Response({"error": "Download record not found."}, status=status.HTTP_404_NOT_FOUND) - download.delete() - return Response(status=status.HTTP_204_NO_CONTENT) - def _store_chapters(ebook: EBook, toc: list[dict[str, Any]], parent_index: int = 0) -> None: """Recursively store TOC entries as BookChapter records.""" diff --git a/backend/config/django.py b/backend/config/django.py index fa66705..21cf721 100644 --- a/backend/config/django.py +++ b/backend/config/django.py @@ -141,13 +141,17 @@ USE_I18N = True USE_TZ = True # --------------------------------------------------------------------------- -# Static / Media +# Static / Media / Uploads # --------------------------------------------------------------------------- STATIC_URL = "static/" STATIC_ROOT = BASE_DIR / "staticfiles" MEDIA_URL = "media/" MEDIA_ROOT = BASE_DIR / "media" +# Maximum upload size: 50MB +DATA_UPLOAD_MAX_MEMORY_SIZE = 52_428_800 +FILE_UPLOAD_MAX_MEMORY_SIZE = 52_428_800 + # --------------------------------------------------------------------------- # Default primary key # --------------------------------------------------------------------------- diff --git a/backend/requirements.txt b/backend/requirements.txt index 53d8e6b..2c8fd46 100644 --- a/backend/requirements.txt +++ b/backend/requirements.txt @@ -8,6 +8,7 @@ pydantic==2.10.5 pydantic-settings==2.7.1 python-dotenv==1.0.1 gunicorn==23.0.0 +Pillow>=11.0.0 pytest==8.3.4 pytest-django==4.9.0 pytest-cov==6.0.0 diff --git a/docker-compose.yml b/docker-compose.yml index e03b53a..0c72ebc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -5,48 +5,54 @@ services: volumes: - postgres_data:/var/lib/postgresql/data environment: - POSTGRES_DB: cloudreader - POSTGRES_USER: cloudreader - POSTGRES_PASSWORD: cloudreader + POSTGRES_DB: cloud_reader + POSTGRES_USER: postgres + POSTGRES_PASSWORD: postgres ports: - "5432:5432" healthcheck: - test: ["CMD-SHELL", "pg_isready -U cloudreader -d cloudreader"] + test: ["CMD-SHELL", "pg_isready -U postgres -d cloud_reader"] interval: 5s timeout: 5s retries: 10 - api: + backend: build: - context: ./api + context: ./backend + dockerfile: Dockerfile ports: - "8000:8000" environment: - DATABASE_URL: "postgres://cloudreader:cloudreader@db:5432/cloudreader" DJANGO_SECRET_KEY: "dev-secret-key-change-in-production" DJANGO_DEBUG: "True" + DB_NAME: cloud_reader + DB_USER: postgres + DB_PASSWORD: postgres + DB_HOST: db + DB_PORT: "5432" volumes: - - ./api:/app - - book_uploads:/app/media + - ./backend:/app + - book_media:/app/media command: > sh -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000" depends_on: db: condition: service_healthy - web: + frontend: build: - context: ./web + context: ./frontend + dockerfile: Dockerfile ports: - - "3000:3000" + - "5173:5173" environment: VITE_API_URL: "http://localhost:8000" volumes: - - ./web:/app + - ./frontend:/app - /app/node_modules depends_on: - - api + - backend volumes: postgres_data: - book_uploads: \ No newline at end of file + book_media: \ No newline at end of file diff --git a/docs/backend/009-expo-integration.md b/docs/backend/009-expo-integration.md new file mode 100644 index 0000000..44a5760 --- /dev/null +++ b/docs/backend/009-expo-integration.md @@ -0,0 +1,96 @@ +# 009 — Expo Mobile Application Integration + +**Issue:** #16 +**Status:** Draft +**Created:** 2026-05-29 + +## Objective + +Integrate an Expo-based React Native mobile application into the `cloud-reader` monorepo, sharing types, API client patterns, and configuration with the existing web frontend. + +## Directory Structure + +``` +cloud-reader/ +├── mobile/ # Expo React Native app +│ ├── package.json +│ ├── app.json +│ ├── tsconfig.json +│ ├── babel.config.js +│ ├── App.tsx # Root component +│ ├── src/ +│ │ ├── api/ # API client (mirrors frontend/src/api/ pattern) +│ │ │ ├── client.ts # Axios instance + JWT interceptor +│ │ │ ├── books.ts # Book API calls +│ │ │ └── annotations.ts +│ │ ├── screens/ # Screen-level components +│ │ ├── components/ # Reusable UI components +│ │ ├── navigation/ # React Navigation setup +│ │ ├── context/ # Auth context, etc. +│ │ ├── hooks/ # Custom hooks +│ │ └── types/ # Mobile-specific types +│ └── assets/ +├── packages/ +│ └── shared/ +│ ├── package.json +│ ├── tsconfig.json +│ └── src/ +│ ├── types.ts # Shared domain types (Book, User, Bookmark, Note) +│ └── utils.ts # Shared utility functions +└── package.json # Root — updated workspace config +``` + +## Monorepo Workspace Config + +Root `package.json` workspaces array updated to include `"mobile"`, `"packages/shared"` alongside existing `"frontend"` and `"backend"`. + +## Shared `packages/shared` + +- `@cloud-reader/shared` package published within the monorepo +- Exports: + - All domain types (`Book`, `BookSummary`, `Bookmark`, `Note`, `User`, `AnnotationEntry`, `PaginatedResponse`, `TokenResponse`) + - API endpoint constants + - Date formatting helpers + - Validation utilities (email regex, password strength check) + +## Mobile App Structure + +### API Client (`mobile/src/api/client.ts`) +- Axios instance configured with: + - Base URL from environment variable (`EXPO_PUBLIC_API_URL`) + - JWT token attachment via request interceptor + - Token refresh response interceptor on 401 + - Uses `AsyncStorage` for token persistence (instead of `localStorage`) + +### Navigation (`mobile/src/navigation/`) +- React Navigation stack: + 1. `AuthStack` — Login, Register screens + 2. `MainTabs` — Library, Search, Settings tabs + 3. `BookReader` — Full-screen reading view + +### Key Screens +| Screen | Route | Purpose | +|--------|-------|---------| +| Login | `Auth/Login` | Email/password login | +| Register | `Auth/Register` | User registration | +| Library | `Main/Library` | Book list with filtering | +| BookDetail | `Main/BookDetail` | Book metadata + actions | +| Reader | `Reader/View` | EPUB/PDF rendering | +| Search | `Main/Search` | Book discovery | +| Settings | `Main/Settings` | Profile, theme, download mgmt | + +## Backend Changes Required + +None. The existing Django REST API already serves all endpoints needed by the mobile app. The mobile app communicates with the same backend via the shared API base URL. + +## Docker + +No changes to `docker-compose.yml` needed — the mobile app runs on-device or via Expo Go, not inside Docker. + +## CI/CD Considerations + +The monorepo structure supports a single pipeline that can: +- `yarn install` at root (installs all workspaces) +- `yarn workspace @cloud-reader/shared build` +- `yarn workspace @cloud-reader/mobile build` (Expo EAS for mobile builds) +- `yarn workspace @cloud-reader/frontend build` (Vite for web builds) \ No newline at end of file diff --git a/docs/backend/search-discovery-spec.md b/docs/backend/search-discovery-spec.md new file mode 100644 index 0000000..590b132 --- /dev/null +++ b/docs/backend/search-discovery-spec.md @@ -0,0 +1,107 @@ +# Book Search & Discovery — Spec + +## Overview +Enable users to search books within the library and discover new books via filters and a dedicated detail view. + +## Backend API Contracts + +### Book List & Search +`GET /api/books/` + +**Query Parameters:** +| Param | Type | Description | +|-------|------|-------------| +| `q` | string | Full-text search across title, author, genre | +| `genre` | string | Exact filter by genre | +| `author` | string | Exact filter by author | +| `reading_status` | string | Filter: `want_to_read`, `reading`, `finished`, `dnf` | +| `ordering` | string | `title`, `author`, `genre`, `created_at` (prefix `-` for desc) | +| `page` | int | Page number (default: 1) | + +**Response (paginated):** +```json +{ + "count": 42, + "next": "http://.../?page=2", + "previous": null, + "results": [ + { + "id": 1, + "title": "Dune", + "author": "Frank Herbert", + "genre": "Science Fiction", + "reading_status": "finished", + "reading_status_display": "Finished", + "cover_image": "https://..." + } + ] +} +``` + +### Book Detail +`GET /api/books/{id}/` + +**Response:** +```json +{ + "id": 1, + "title": "Dune", + "author": "Frank Herbert", + "genre": "Science Fiction", + "description": "...", + "reading_status": "finished", + "reading_status_display": "Finished", + "cover_image": "https://...", + "total_pages": 688, + "created_at": "2025-01-01T00:00:00Z", + "updated_at": "2025-01-15T00:00:00Z" +} +``` + +### Genre / Author Discovery +`GET /api/books/genres/` → `["Fiction", "Science Fiction", ...]` + +`GET /api/books/authors/` → `["Frank Herbert", "Ursula K. Le Guin", ...]` + +## Frontend Components + +### LibraryPage (enhanced) +- **Search bar** at top: text input with debounced `onChange` → calls API with `q` param +- **Filter row**: genre dropdown, author dropdown, reading status dropdown + - Genre/Author dropdowns populated from `/api/books/genres/` and `/api/books/authors/` + - Reading status uses static enum values (`READING_STATUS_OPTIONS`) +- **Results grid**: card layout showing cover, title, author, reading status badge +- **Empty state**: "No books found" with clear message when results are empty +- **Loading state**: spinner/skeleton while fetching +- **Click card → navigate to** `/books/{id}` + +### BookDetailPage (new) +- Shows full book info: cover, title, author, genre, description, reading status, total pages +- Back button to return to library +- Clean, mobile-responsive layout + +### API Client — `frontend/src/api/books.ts` + +| Method | Endpoint | Returns | +|--------|----------|---------| +| `searchBooks(params)` | `GET /api/books/` | `{count, results: BookListItem[]}` | +| `getBook(id)` | `GET /api/books/{id}/` | `BookDetail` | +| `getGenres()` | `GET /api/books/genres/` | `string[]` | +| `getAuthors()` | `GET /api/books/authors/` | `string[]` | + +## Routes (Frontend) +| Path | Component | Auth | +|------|-----------|------| +| `/` | LibraryPage | Protected | +| `/books/:id` | BookDetailPage | Protected | + +## Data Flow +1. User types in search bar → 300ms debounce → `GET /api/books/?q=...` +2. User selects filter → `GET /api/books/?genre=...&author=...&reading_status=...` +3. User clicks result → navigate to `/books/:id` +4. BookDetailPage → `GET /api/books/{id}/` + +## Mobile Optimizations +- Filters collapse into a toggleable panel on small screens +- Cards stack in single column on mobile +- Touch-friendly tap targets (min 44px) \ No newline at end of file diff --git a/docs/frontend/mobile-search-spec.md b/docs/frontend/mobile-search-spec.md new file mode 100644 index 0000000..c3938b7 --- /dev/null +++ b/docs/frontend/mobile-search-spec.md @@ -0,0 +1,99 @@ +# Mobile Book Search & Discovery — Spec + +## Overview +Enhance the existing book search experience with mobile-first features: voice search via the Web Speech API, real-time autocomplete suggestions, and touch-optimized responsive layout. + +## Prerequisites +- Backend endpoints already exist (from `docs/backend/search-discovery-spec.md`): + - `GET /api/books/?q=...&genre=...&author=...&reading_status=...` — paginated search + - `GET /api/books/{id}/` — book detail + - `GET /api/books/genres/` — genre discovery + - `GET /api/books/authors/` — author discovery +- Frontend `LibraryPage` and `BookDetailPage` components exist but lacked API client methods and types (fixed in this PR). + +## Frontend API Client Additions + +### `frontend/src/types/book.ts` — New exports + +```typescript +export interface BookSearchParams { + q?: string; + genre?: string; + author?: string; + reading_status?: string; + ordering?: string; + page?: number; + page_size?: number; +} + +export const READING_STATUS_OPTIONS: { value: string; label: string }[] = [ + { value: "", label: "All Statuses" }, + { value: "want_to_read", label: "Want to Read" }, + { value: "reading", label: "Reading" }, + { value: "finished", label: "Finished" }, + { value: "dnf", label: "Did Not Finish" }, +]; +``` + +### `frontend/src/api/books.ts` — New methods on `booksApi` + +| Method | Endpoint | Returns | +|--------|----------|---------| +| `searchBooks(params)` | `GET /api/books/` | `{ count, results: BookListItem[] }` | +| `getBook(id)` | `GET /api/books/{id}/` | `BookDetail` | +| `getGenres()` | `GET /api/books/genres/` | `string[]` | +| `getAuthors()` | `GET /api/books/authors/` | `string[]` | + +## Mobile Features + +### 1. Voice Search +- **Hook**: `useVoiceSearch` in `frontend/src/hooks/useVoiceSearch.ts` +- Uses the Web Speech API (`SpeechRecognition` / `webkitSpeechRecognition`) +- Returns: `{ isListening, transcript, isSupported, startListening, stopListening, hasError }` +- Renders a microphone icon button next to the search input +- On mobile, tapping the mic icon triggers the native speech recognition prompt +- On success, populates the search input with the transcript and triggers a search +- Graceful degradation: if SpeechRecognition API is unavailable, the mic button is hidden + +### 2. Real-Time Suggestions (Autocomplete) +- Component: `SearchSuggestions` rendered as a dropdown below the search input +- On each keystroke (debounced 200ms), fetches `GET /api/books/?q=...&page_size=5` for suggestions +- Shows up to 5 book title/author suggestions in a styled dropdown list +- Clicking a suggestion navigates directly to `/books/{id}` +- Clicking outside or pressing Escape dismisses the dropdown +- Combines with existing full search results — suggestions are fast previews, not the main result list + +### 3. Mobile-Responsive Enhancements +- Filters panel is **collapsed by default** on mobile, toggleable via a "Filters" button +- Touch targets minimum 44px (WCAG 2.1) +- Results grid switches to **single column** below 600px viewport width +- Search input and filters panel stack vertically on small screens +- Add CSS breakpoints via inline styles and a `useMediaQuery` hook +- Bottom navigation-style action buttons on mobile (Add Book, Bookmarks, Settings become icon-only) + +## Component Hierarchy + +``` +LibraryPage +├── Header (title, count, action buttons) +├── SearchInput +│ ├── TextInput (debounced 300ms) +│ ├── VoiceSearchButton (microphone icon) +│ └── SearchSuggestions (dropdown, debounced 200ms) +├── FiltersButton (mobile: toggle; desktop: always visible) +├── FiltersPanel (collapsible on mobile) +│ ├── GenreSelect +│ ├── AuthorSelect +│ ├── StatusSelect +│ └── ClearFiltersButton +├── LoadingState (skeleton grid) +├── ErrorState (message + retry button) +├── EmptyState (no results / no books) +└── ResultsGrid (responsive: auto-fill vs single column) +``` + +## Mobile-First CSS Strategy +- Use inline styles with `@media` queries in a shared `breakpoints.ts` utility +- Breakpoints: sm = 480px, md = 768px, lg = 1024px +- Base styles are mobile-first (single column, full width) +- Media queries expand to multi-column grid and horizontal layout on larger screens \ No newline at end of file diff --git a/frontend/Dockerfile b/frontend/Dockerfile new file mode 100644 index 0000000..d1f6bfe --- /dev/null +++ b/frontend/Dockerfile @@ -0,0 +1,12 @@ +FROM node:20-alpine + +WORKDIR /app + +COPY package.json yarn.lock ./ +RUN yarn install --frozen-lockfile + +COPY . ./ + +EXPOSE 5173 + +CMD ["yarn", "dev", "--host"] \ No newline at end of file diff --git a/frontend/src/api/books.ts b/frontend/src/api/books.ts new file mode 100644 index 0000000..d98bf29 --- /dev/null +++ b/frontend/src/api/books.ts @@ -0,0 +1,121 @@ +import api from "./client"; +import type { + BookDetail, + BookListItem, + BookSearchParams, + ContentResponse, + EBookDetail, + EBookListItem, + ReadingProgress, + ReadingSettings, + TocResponse, +} from "../types/book"; + +export const booksApi = { + async getEBooks(): Promise { + const { data } = await api.get("/books/ebooks/"); + return data; + }, + + async searchBooks(params: BookSearchParams = {}): Promise<{ count: number; results: BookListItem[] }> { + const { data } = await api.get<{ count: number; results: BookListItem[] }>("/books/", { params }); + return data; + }, + + async getBook(id: number): Promise { + const { data } = await api.get(`/books/${id}/`); + return data; + }, + + async getGenres(): Promise { + const { data } = await api.get("/books/genres/"); + return data; + }, + + async getAuthors(): Promise { + const { data } = await api.get("/books/authors/"); + return data; + }, + + async getEBook(id: number): Promise { + const { data } = await api.get(`/books/ebooks/${id}/`); + return data; + }, + + async searchBooks(params: BookSearchParams = {}): Promise<{ count: number; results: BookListItem[] }> { + const { data } = await api.get<{ count: number; results: BookListItem[] }>("/books/", { params }); + return data; + }, + + async getBook(id: number): Promise { + const { data } = await api.get(`/books/${id}/`); + return data; + }, + + async getGenres(): Promise { + const { data } = await api.get("/books/genres/"); + return data; + }, + + async getAuthors(): Promise { + const { data } = await api.get("/books/authors/"); + return data; + }, + + async uploadEBook( + file: File, + title: string, + author: string, + coverImage?: File | null, + ): Promise { + const formData = new FormData(); + formData.append("file", file); + formData.append("title", title); + if (author) formData.append("author", author); + if (coverImage) formData.append("cover_image", coverImage); + + const { data } = await api.post("/books/ebooks/", formData, { + headers: { "Content-Type": "multipart/form-data" }, + }); + return data; + }, + + async deleteEBook(id: number): Promise { + await api.delete(`/books/ebooks/${id}/`); + }, + + async processEBook(id: number): Promise<{ status: string }> { + const { data } = await api.post<{ status: string }>(`/books/ebooks/${id}/process/`); + return data; + }, + + async getToc(id: number): Promise { + const { data } = await api.get(`/books/ebooks/${id}/toc/`); + return data; + }, + + async getContent(id: number, page: number): Promise { + const { data } = await api.get(`/books/ebooks/${id}/content/?page=${page}`); + return data; + }, + + async getProgress(ebookId: number): Promise { + const { data } = await api.get(`/books/ebooks/${ebookId}/progress/`); + return data; + }, + + async updateProgress(ebookId: number, progressData: Partial): Promise { + const { data } = await api.patch(`/books/ebooks/${ebookId}/progress/`, progressData); + return data; + }, + + async getSettings(): Promise { + const { data } = await api.get("/books/settings/"); + return data; + }, + + async updateSettings(settingsData: Partial): Promise { + const { data } = await api.patch("/books/settings/", settingsData); + return data; + }, +}; \ No newline at end of file diff --git a/frontend/src/components/search/SearchSuggestions.module.css b/frontend/src/components/search/SearchSuggestions.module.css new file mode 100644 index 0000000..3d71127 --- /dev/null +++ b/frontend/src/components/search/SearchSuggestions.module.css @@ -0,0 +1,65 @@ +.container { + position: absolute; + top: 100%; + left: 0; + right: 0; + z-index: 100; + background: #fff; + border: 1px solid #e5e7eb; + border-top: none; + border-radius: 0 0 10px 10px; + box-shadow: 0 8px 24px rgba(0, 0, 0, 0.12); + max-height: 320px; + overflow-y: auto; +} + +.infoText { + padding: 12px 16px; + color: #9ca3af; + font-size: 13px; +} + +.suggestionItem { + display: flex; + align-items: center; + gap: 12px; + padding: 10px 16px; + cursor: pointer; + border-bottom: 1px solid #f3f4f6; + min-height: 44px; +} + +.suggestionItem:hover { + background: #f9fafb; +} + +.coverImage { + width: 32px; + height: 48px; + object-fit: cover; + border-radius: 4px; +} + +.coverPlaceholder { + font-size: 20px; + flex-shrink: 0; +} + +.bookInfo { + min-width: 0; +} + +.bookTitle { + font-size: 14px; + font-weight: 600; + color: #1f2937; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.bookAuthor { + font-size: 12px; + color: #6b7280; + margin-top: 2px; +} \ No newline at end of file diff --git a/frontend/src/components/search/SearchSuggestions.tsx b/frontend/src/components/search/SearchSuggestions.tsx new file mode 100644 index 0000000..136e24b --- /dev/null +++ b/frontend/src/components/search/SearchSuggestions.tsx @@ -0,0 +1,120 @@ +import { useEffect, useRef, useState } from "react"; +import { useNavigate } from "react-router-dom"; +import { booksApi } from "../../api/books"; +import { useDebounce } from "../../hooks/useDebounce"; +import type { BookListItem } from "../../types/book"; +import styles from "./SearchSuggestions.module.css"; + +interface SearchSuggestionsProps { + query: string; + visible: boolean; + onClose: () => void; + onSelectSuggestion: () => void; +} + +export function SearchSuggestions({ query, visible, onClose, onSelectSuggestion }: SearchSuggestionsProps) { + const navigate = useNavigate(); + const [suggestions, setSuggestions] = useState([]); + const [loading, setLoading] = useState(false); + const containerRef = useRef(null); + const debouncedQuery = useDebounce(query, 200); + + useEffect(() => { + if (!debouncedQuery.trim()) { + setSuggestions([]); + return; + } + let cancelled = false; + setLoading(true); + void booksApi.searchBooks({ q: debouncedQuery.trim(), page_size: 5 }).then( + (res) => { + if (!cancelled) { + setSuggestions(res.results); + setLoading(false); + } + }, + () => { + if (!cancelled) { + setSuggestions([]); + setLoading(false); + } + }, + ); + return () => { + cancelled = true; + }; + }, [debouncedQuery]); + + // Close on click outside + useEffect(() => { + if (!visible) return; + const handler = (e: MouseEvent) => { + if (containerRef.current && !containerRef.current.contains(e.target as Node)) { + onClose(); + } + }; + // Delay attachment to avoid the click that opened us from immediately closing + const timer = setTimeout(() => document.addEventListener("click", handler), 0); + return () => { + clearTimeout(timer); + document.removeEventListener("click", handler); + }; + }, [visible, onClose]); + + // Close on Escape + useEffect(() => { + if (!visible) return; + const handler = (e: KeyboardEvent) => { + if (e.key === "Escape") onClose(); + }; + document.addEventListener("keydown", handler); + return () => document.removeEventListener("keydown", handler); + }, [visible, onClose]); + + if (!visible || !query.trim()) return null; + + return ( +
+ {loading && ( +
+ Searching... +
+ )} + {!loading && suggestions.length === 0 && debouncedQuery.trim() && ( +
+ No quick suggestions +
+ )} + {suggestions.map((book) => ( +
{ + onSelectSuggestion(); + navigate(`/books/${book.id}`); + }} + > + + {book.cover_image ? ( + + ) : ( + "📖" + )} + +
+
+ {book.title} +
+
+ {book.author || "Unknown Author"} +
+
+
+ ))} +
+ ); +} \ No newline at end of file diff --git a/frontend/src/context/AuthContext.tsx b/frontend/src/context/AuthContext.tsx new file mode 100644 index 0000000..de9ce9a --- /dev/null +++ b/frontend/src/context/AuthContext.tsx @@ -0,0 +1,63 @@ +import React, { createContext, useCallback, useContext, useEffect, useState } from "react"; +import api from "../api/client"; + +interface AuthContextValue { + isAuthenticated: boolean; + loading: boolean; + user: { email: string } | null; + login: (email: string, password: string) => Promise; + register: (email: string, password: string) => Promise; + logout: () => void; +} + +const AuthContext = createContext(null); + +export function AuthProvider({ children }: { children: React.ReactNode }) { + const [user, setUser] = useState<{ email: string } | null>(null); + const [loading, setLoading] = useState(true); + + useEffect(() => { + const token = localStorage.getItem("access_token"); + if (token) { + try { + const payload = JSON.parse(atob(token.split(".")[1] ?? "")); + setUser({ email: payload.email ?? payload.sub ?? "user" }); + } catch { + localStorage.removeItem("access_token"); + localStorage.removeItem("refresh_token"); + } + } + setLoading(false); + }, []); + + const login = useCallback(async (email: string, password: string) => { + const { data } = await api.post<{ access: string; refresh: string }>("/auth/token/", { email, password }); + localStorage.setItem("access_token", data.access); + localStorage.setItem("refresh_token", data.refresh); + const payload = JSON.parse(atob(data.access.split(".")[1] ?? "")); + setUser({ email: payload.email ?? payload.sub ?? "user" }); + }, []); + + const register = useCallback(async (email: string, password: string) => { + await api.post("/auth/register/", { email, password }); + await login(email, password); + }, [login]); + + const logout = useCallback(() => { + localStorage.removeItem("access_token"); + localStorage.removeItem("refresh_token"); + setUser(null); + }, []); + + return ( + + {children} + + ); +} + +export function useAuth(): AuthContextValue { + const ctx = useContext(AuthContext); + if (!ctx) throw new Error("useAuth must be used within an AuthProvider"); + return ctx; +} \ No newline at end of file diff --git a/frontend/src/hooks/index.ts b/frontend/src/hooks/index.ts index 8a33b83..24a0685 100644 --- a/frontend/src/hooks/index.ts +++ b/frontend/src/hooks/index.ts @@ -1 +1,4 @@ -export { usePaginatedQuery } from "./usePaginatedQuery"; \ No newline at end of file +export { usePaginatedQuery } from "./usePaginatedQuery"; +export { useDebounce } from "./useDebounce"; +export { useVoiceSearch } from "./useVoiceSearch"; +export { useMediaQuery } from "./useMediaQuery"; \ No newline at end of file diff --git a/frontend/src/hooks/useDebounce.ts b/frontend/src/hooks/useDebounce.ts new file mode 100644 index 0000000..531a177 --- /dev/null +++ b/frontend/src/hooks/useDebounce.ts @@ -0,0 +1,18 @@ +import { useEffect, useState } from "react"; + +/** + * A hook that debounces a value by the specified delay. + * @param value - The value to debounce + * @param delay - The delay in milliseconds + * @returns The debounced value + */ +export function useDebounce(value: T, delay: number): T { + const [debounced, setDebounced] = useState(value); + + useEffect(() => { + const timer = setTimeout(() => setDebounced(value), delay); + return () => clearTimeout(timer); + }, [value, delay]); + + return debounced; +} \ No newline at end of file diff --git a/frontend/src/hooks/useMediaQuery.ts b/frontend/src/hooks/useMediaQuery.ts new file mode 100644 index 0000000..36e2843 --- /dev/null +++ b/frontend/src/hooks/useMediaQuery.ts @@ -0,0 +1,26 @@ +import { useEffect, useState } from "react"; + +/** + * Hook for responsive design — returns true when the media query matches. + * Defaults to false on SSR / initial render to avoid hydration mismatch. + */ +export function useMediaQuery(query: string): boolean { + const [matches, setMatches] = useState(false); + + useEffect(() => { + const mql = window.matchMedia(query); + setMatches(mql.matches); + + const handler = (e: MediaQueryListEvent) => setMatches(e.matches); + mql.addEventListener("change", handler); + return () => mql.removeEventListener("change", handler); + }, [query]); + + return matches; +} + +export const BREAKPOINTS = { + sm: "(max-width: 480px)", + md: "(max-width: 768px)", + lg: "(min-width: 1024px)", +} as const; \ No newline at end of file diff --git a/frontend/src/hooks/useVoiceSearch.ts b/frontend/src/hooks/useVoiceSearch.ts new file mode 100644 index 0000000..c6e43c4 --- /dev/null +++ b/frontend/src/hooks/useVoiceSearch.ts @@ -0,0 +1,105 @@ +import { useCallback, useEffect, useRef, useState } from "react"; + +export interface UseVoiceSearchResult { + isListening: boolean; + transcript: string; + isSupported: boolean; + hasError: boolean; + errorMessage: string | null; + startListening: () => void; + stopListening: () => void; +} + +/** + * Hook for voice search using the Web Speech API. + * Returns a microphone control interface. + * Gracefully degrades when SpeechRecognition is unavailable. + */ +export function useVoiceSearch(): UseVoiceSearchResult { + const [isListening, setIsListening] = useState(false); + const [transcript, setTranscript] = useState(""); + const [isSupported, setIsSupported] = useState(false); + const [hasError, setHasError] = useState(false); + const [errorMessage, setErrorMessage] = useState(null); + + const recognitionRef = useRef(null); + const mountedRef = useRef(true); + + useEffect(() => { + mountedRef.current = true; + // Check for SpeechRecognition support (standard + webkit prefix) + const SpeechRecognitionCtor = + (window as unknown as Record).SpeechRecognition ?? + (window as unknown as Record).webkitSpeechRecognition; + + if (typeof SpeechRecognitionCtor === "function") { + setIsSupported(true); + const recognition = new (SpeechRecognitionCtor as new () => SpeechRecognition)(); + recognition.continuous = false; + recognition.interimResults = false; + recognition.lang = "en-US"; + + recognition.onresult = (event: SpeechRecognitionEvent) => { + const resultText = event.results[0]?.[0]?.transcript ?? ""; + if (mountedRef.current) { + setTranscript(resultText); + setHasError(false); + setErrorMessage(null); + } + }; + + recognition.onerror = (event: SpeechRecognitionErrorEvent) => { + if (mountedRef.current) { + setHasError(true); + setErrorMessage(event.error); + setIsListening(false); + } + }; + + recognition.onend = () => { + if (mountedRef.current) { + setIsListening(false); + } + }; + + recognitionRef.current = recognition; + } + + return () => { + mountedRef.current = false; + if (recognitionRef.current) { + recognitionRef.current.abort(); + } + }; + }, []); + + const startListening = useCallback(() => { + if (!recognitionRef.current) return; + setTranscript(""); + setHasError(false); + setErrorMessage(null); + try { + recognitionRef.current.start(); + setIsListening(true); + } catch { + // May throw if already started + setIsListening(false); + } + }, []); + + const stopListening = useCallback(() => { + if (!recognitionRef.current) return; + recognitionRef.current.stop(); + setIsListening(false); + }, []); + + return { + isListening, + transcript, + isSupported, + hasError, + errorMessage, + startListening, + stopListening, + }; +} \ No newline at end of file diff --git a/frontend/src/pages/AddBook.tsx b/frontend/src/pages/AddBook.tsx new file mode 100644 index 0000000..c7851b6 --- /dev/null +++ b/frontend/src/pages/AddBook.tsx @@ -0,0 +1,57 @@ +import React, { useState } from "react"; +import { useNavigate } from "react-router-dom"; +import { booksApi } from "../api/books"; + +export function AddBookPage() { + const navigate = useNavigate(); + const [title, setTitle] = useState(""); + const [author, setAuthor] = useState(""); + const [file, setFile] = useState(null); + const [uploading, setUploading] = useState(false); + const [error, setError] = useState(null); + + const handleFileChange = (e: React.ChangeEvent) => { + const selected = e.target.files?.[0] ?? null; + if (selected) { + const ext = selected.name.split(".").pop()?.toLowerCase(); + if (ext !== "epub" && ext !== "pdf") { setError("Only EPUB and PDF files are supported."); setFile(null); return; } + setFile(selected); setError(null); + if (!title) setTitle(selected.name.replace(/\.(epub|pdf)$/i, "")); + } + }; + + const handleSubmit = async (e: React.FormEvent) => { + e.preventDefault(); + if (!file || !title.trim()) { setError("Title and file are required."); return; } + setUploading(true); setError(null); + try { await booksApi.uploadEBook(file, title.trim(), author.trim()); navigate("/"); } + catch (err) { setError(err instanceof Error ? err.message : "Upload failed."); } + finally { setUploading(false); } + }; + + return ( +
+
+ +

Add Book

+
+
+ {error &&
{error}
} +
+ + + {file &&

Selected: {file.name}

} +
+
+ + setTitle(e.target.value)} placeholder="Book title" style={{ padding: "10px 12px", borderRadius: 6, border: "1px solid #ddd", fontSize: 16, outline: "none" }} /> +
+
+ + setAuthor(e.target.value)} placeholder="Author name" style={{ padding: "10px 12px", borderRadius: 6, border: "1px solid #ddd", fontSize: 16, outline: "none" }} /> +
+ +
+
+ ); +} \ No newline at end of file diff --git a/frontend/src/pages/AuthPage.tsx b/frontend/src/pages/AuthPage.tsx new file mode 100644 index 0000000..57c2516 --- /dev/null +++ b/frontend/src/pages/AuthPage.tsx @@ -0,0 +1,57 @@ +import React, { useState } from "react"; +import { useNavigate } from "react-router-dom"; +import { useAuth } from "../context/AuthContext"; + +function AuthForm({ isLogin, onToggle }: { isLogin: boolean; onToggle: () => void }) { + const [email, setEmail] = useState(""); + const [password, setPassword] = useState(""); + const [confirmPassword, setConfirmPassword] = useState(""); + const [error, setError] = useState(null); + const [loading, setLoading] = useState(false); + const { login, register } = useAuth(); + const navigate = useNavigate(); + + const handleSubmit = async (e: React.FormEvent) => { + e.preventDefault(); setError(null); + if (!isLogin && password !== confirmPassword) { setError("Passwords do not match."); return; } + setLoading(true); + try { + if (isLogin) await login(email, password); + else await register(email, password); + navigate("/"); + } catch (err) { setError(err instanceof Error ? err.message : isLogin ? "Login failed" : "Registration failed"); } + finally { setLoading(false); } + }; + + return ( +
+
+

Cloud Reader

+

{isLogin ? "Sign In" : "Create Account"}

+
+ {error &&
{error}
} +
+ + setEmail(e.target.value)} placeholder="you@example.com" required style={{ padding: "10px 12px", borderRadius: 6, border: "1px solid #ddd", fontSize: 16, outline: "none" }} /> +
+
+ + setPassword(e.target.value)} placeholder="At least 8 characters" required minLength={8} style={{ padding: "10px 12px", borderRadius: 6, border: "1px solid #ddd", fontSize: 16, outline: "none" }} /> +
+ {!isLogin &&
+ + setConfirmPassword(e.target.value)} placeholder="Repeat your password" required minLength={8} style={{ padding: "10px 12px", borderRadius: 6, border: "1px solid #ddd", fontSize: 16, outline: "none" }} /> +
} + +
+

+ {isLogin ? "Don't have an account? " : "Already have an account? "} + +

+
+
+ ); +} + +export function LoginPage({ onToggle }: { onToggle: () => void }) { return ; } +export function RegisterPage({ onToggle }: { onToggle: () => void }) { return ; } \ No newline at end of file diff --git a/frontend/src/pages/BookDetailPage.tsx b/frontend/src/pages/BookDetailPage.tsx new file mode 100644 index 0000000..a21d316 --- /dev/null +++ b/frontend/src/pages/BookDetailPage.tsx @@ -0,0 +1,208 @@ +import React, { useCallback, useEffect, useState } from "react"; +import { useNavigate, useParams } from "react-router-dom"; +import { booksApi } from "../api/books"; +import type { BookDetail } from "../types/book"; +import { useMediaQuery, BREAKPOINTS } from "../hooks/useMediaQuery"; + +export function BookDetailPage() { + const { id } = useParams<{ id: string }>(); + const navigate = useNavigate(); + const [book, setBook] = useState(null); + const [loading, setLoading] = useState(true); + const [error, setError] = useState(null); + const isMobile = useMediaQuery(BREAKPOINTS.md); + + const loadBook = useCallback(async () => { + if (!id) return; + setLoading(true); + setError(null); + try { + const bookId = Number(id); + if (Number.isNaN(bookId)) { + setError("Invalid book ID"); + return; + } + const data = await booksApi.getBook(bookId); + setBook(data); + } catch (err) { + setError(err instanceof Error ? err.message : "Failed to load book details"); + } finally { + setLoading(false); + } + }, [id]); + + useEffect(() => { + void loadBook(); + }, [loadBook]); + + const statusColors: Record = { + want_to_read: { bg: "#dbeafe", text: "#1d4ed8" }, + reading: { bg: "#dcfce7", text: "#16a34a" }, + finished: { bg: "#f3e8ff", text: "#9333ea" }, + dnf: { bg: "#fef3c7", text: "#b45309" }, + }; + + const containerStyle: React.CSSProperties = { + maxWidth: 720, + margin: "0 auto", + padding: isMobile ? 16 : 24, + minHeight: "100vh", + background: "#f8f9fa", + }; + + const backButtonStyle: React.CSSProperties = { + display: "inline-flex", + alignItems: "center", + gap: 4, + padding: isMobile ? "10px 16px" : "8px 16px", + borderRadius: 8, + border: "1px solid #e5e7eb", + background: "#fff", + color: "#374151", + fontSize: isMobile ? 15 : 14, + cursor: "pointer", + marginBottom: isMobile ? 16 : 24, + minHeight: 44, + }; + + if (loading) { + return ( +
+
+
+
+
+
+
+
+
+
+
+
+
+
+ ); + } + + if (error || !book) { + return ( +
+ +
+
😕
+

Book not found

+

{error || "The book you're looking for doesn't exist or has been removed."}

+ +
+
+ ); + } + + const sc = statusColors[book.reading_status] ?? { bg: "#f3f4f6", text: "#6b7280" }; + + return ( +
+ {/* Back button */} + + + {/* Book Detail */} +
+ {/* Cover */} +
+
+ {book.cover_image + ? {book.title} + : 📖} +
+
+ + {/* Info */} +
+

+ {book.title} +

+ + {book.author && ( +

+ by {book.author} +

+ )} + +
+ + {book.reading_status_display} + + {book.genre && ( + + {book.genre} + + )} + {book.total_pages > 0 && ( + + {book.total_pages} pages + + )} +
+ + {book.description && ( +
+

Description

+

+ {book.description} +

+
+ )} + +
+

+ Added {new Date(book.created_at).toLocaleDateString(undefined, { year: "numeric", month: "long", day: "numeric" })} + {book.created_at !== book.updated_at && ` · Updated ${new Date(book.updated_at).toLocaleDateString(undefined, { year: "numeric", month: "long", day: "numeric" })}`} +

+
+ + {/* Mobile full-width back button */} + {isMobile && ( +
+ +
+ )} +
+
+
+ ); +} \ No newline at end of file diff --git a/frontend/src/pages/Library.module.css b/frontend/src/pages/Library.module.css new file mode 100644 index 0000000..efb786e --- /dev/null +++ b/frontend/src/pages/Library.module.css @@ -0,0 +1,13 @@ +.bookCard { + background: #fff; + border-radius: 12px; + overflow: hidden; + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.06); + cursor: pointer; + transition: transform 0.15s, box-shadow 0.15s; +} + +.bookCard:hover { + transform: translateY(-2px); + box-shadow: 0 4px 16px rgba(0, 0, 0, 0.1); +} \ No newline at end of file diff --git a/frontend/src/pages/Library.tsx b/frontend/src/pages/Library.tsx new file mode 100644 index 0000000..dee2a62 --- /dev/null +++ b/frontend/src/pages/Library.tsx @@ -0,0 +1,545 @@ +import React, { useCallback, useEffect, useRef, useState } from "react"; +import { useNavigate } from "react-router-dom"; +import { booksApi } from "../api/books"; +import type { BookListItem, BookSearchParams } from "../types/book"; +import { READING_STATUS_OPTIONS } from "../types/book"; +import { useAuth } from "../context/AuthContext"; +import { useDebounce } from "../hooks/useDebounce"; +import { useVoiceSearch } from "../hooks/useVoiceSearch"; +import { useMediaQuery, BREAKPOINTS } from "../hooks/useMediaQuery"; +import { SearchSuggestions } from "../components/search/SearchSuggestions"; +import styles from "./Library.module.css"; + +interface FilterState { + genre: string; + author: string; + reading_status: string; +} + +/** WCAG 2.1 minimum touch target */ +const TOUCH_TARGET: React.CSSProperties = { + minHeight: 44, + minWidth: 44, + display: "inline-flex", + alignItems: "center", + justifyContent: "center", +}; + +export function LibraryPage() { + const navigate = useNavigate(); + const { logout } = useAuth(); + + const [books, setBooks] = useState([]); + const [loading, setLoading] = useState(true); + const [error, setError] = useState(null); + const [searchQuery, setSearchQuery] = useState(""); + const [filters, setFilters] = useState({ genre: "", author: "", reading_status: "" }); + const [genres, setGenres] = useState([]); + const [authors, setAuthors] = useState([]); + const [totalCount, setTotalCount] = useState(0); + const [showFilters, setShowFilters] = useState(false); + const [showSuggestions, setShowSuggestions] = useState(false); + + const debouncedSearch = useDebounce(searchQuery, 300); + const loadedRef = useRef(false); + const searchInputRef = useRef(null); + const isMobile = useMediaQuery(BREAKPOINTS.md); + + // Voice search + const voiceSearch = useVoiceSearch(); + + // Sync voice transcript into search input + useEffect(() => { + if (voiceSearch.transcript && !voiceSearch.isListening) { + setSearchQuery(voiceSearch.transcript); + setShowSuggestions(false); + } + }, [voiceSearch.transcript, voiceSearch.isListening]); + + // Load filter options once + useEffect(() => { + if (loadedRef.current) return; + loadedRef.current = true; + void Promise.all([booksApi.getGenres(), booksApi.getAuthors()]).then( + ([genreList, authorList]) => { + setGenres(genreList); + setAuthors(authorList); + }, + () => { + // Filters degrade gracefully if discovery endpoints fail + }, + ); + }, []); + + const loadBooks = useCallback(async (params: BookSearchParams) => { + setLoading(true); + setError(null); + try { + const response = await booksApi.searchBooks(params); + setBooks(response.results); + setTotalCount(response.count); + } catch (err) { + setError(err instanceof Error ? err.message : "Failed to load books"); + setBooks([]); + setTotalCount(0); + } finally { + setLoading(false); + } + }, []); + + // Reload when search or filters change + useEffect(() => { + const params: BookSearchParams = {}; + if (debouncedSearch) params.q = debouncedSearch; + if (filters.genre) params.genre = filters.genre; + if (filters.author) params.author = filters.author; + if (filters.reading_status) params.reading_status = filters.reading_status; + void loadBooks(params); + }, [debouncedSearch, filters, loadBooks]); + + const handleFilterChange = (key: keyof FilterState, value: string) => { + setFilters((prev: FilterState) => ({ ...prev, [key]: value })); + }; + + const clearAllFilters = () => { + setSearchQuery(""); + setFilters({ genre: "", author: "", reading_status: "" }); + setShowFilters(false); + }; + + const hasActiveFilters = !!searchQuery || !!filters.genre || !!filters.author || !!filters.reading_status; + + const containerStyle: React.CSSProperties = { + maxWidth: 960, + margin: "0 auto", + padding: isMobile ? 12 : 16, + minHeight: "100vh", + background: "#f8f9fa", + }; + + const headerStyle: React.CSSProperties = { + display: "flex", + justifyContent: "space-between", + alignItems: "center", + marginBottom: isMobile ? 12 : 20, + padding: isMobile ? "12px 0" : "16px 0", + borderBottom: "1px solid #e5e7eb", + flexWrap: "wrap", + gap: 8, + }; + + const searchContainerStyle: React.CSSProperties = { + position: "relative", + flex: 1, + }; + + return ( +
+ {/* Header */} +
+
+

Library

+ {!loading && ( +

+ {totalCount} book{totalCount !== 1 ? "s" : ""} +

+ )} +
+
+ {isMobile ? ( + <> + + + + + + ) : ( + <> + + + + + + )} +
+
+ + {/* Search Bar */} +
+
+
+ { + setSearchQuery(e.target.value); + setShowSuggestions(true); + }} + onFocus={() => setShowSuggestions(true)} + style={{ + width: "100%", + padding: `12px 16px 12px ${voiceSearch.isSupported ? 44 : 44}px`, + paddingRight: voiceSearch.isSupported ? 48 : 16, + borderRadius: 10, + border: "1px solid #e5e7eb", + fontSize: isMobile ? 16 : 15, + background: "#fff", + outline: "none", + boxSizing: "border-box", + minHeight: 44, + }} + /> + 🔍 + + {/* Voice Search Button */} + {voiceSearch.isSupported && ( + + )} + + {/* Real-time Suggestions */} + setShowSuggestions(false)} + onSelectSuggestion={() => setShowSuggestions(false)} + /> +
+ +
+
+ + {/* Voice search listening indicator */} + {voiceSearch.isListening && ( +
+ + Listening... speak now + +
+ )} + + {/* Voice search error */} + {voiceSearch.hasError && !voiceSearch.isListening && ( +
+ Voice search: {voiceSearch.errorMessage === "no-speech" ? "No speech detected. Try again." : voiceSearch.errorMessage} +
+ )} + + {/* Filters Panel */} + {showFilters && ( +
+
+ + +
+
+ + +
+
+ + +
+ {hasActiveFilters && ( + + )} +
+ )} + + {/* Error State */} + {error && ( +
+

{error}

+ +
+ )} + + {/* Loading State */} + {loading && ( +
+ {Array.from({ length: isMobile ? 4 : 8 }).map((_, i) => ( +
+
+
+
+
+
+
+ ))} +
+ )} + + {/* Empty State */} + {!loading && !error && books.length === 0 && ( +
+
{hasActiveFilters ? "🔍" : "📚"}
+

+ {hasActiveFilters ? "No books found" : "Your library is empty"} +

+

+ {hasActiveFilters + ? "Try adjusting your search query or filters to discover more books." + : "Add a book to get started building your collection."} +

+ {hasActiveFilters ? ( + + ) : ( + + )} +
+ )} + + {/* Results Grid */} + {!loading && books.length > 0 && ( +
+ {books.map((book) => { + const statusColors: Record = { + want_to_read: { bg: "#dbeafe", text: "#1d4ed8" }, + reading: { bg: "#dcfce7", text: "#16a34a" }, + finished: { bg: "#f3e8ff", text: "#9333ea" }, + dnf: { bg: "#fef3c7", text: "#b45309" }, + }; + const sc = statusColors[book.reading_status] ?? { bg: "#f3f4f6", text: "#6b7280" }; + + return ( +
navigate(`/books/${book.id}`)} + className={styles.bookCard} + style={{ + display: isMobile ? "flex" : "block", + }} + > +
+ {book.cover_image + ? {book.title} + : 📖} + {!isMobile && ( + + {book.reading_status_display} + + )} +
+
+
+
+

+ {book.title} +

+

+ {book.author || "Unknown Author"} +

+
+ {isMobile && ( + + {book.reading_status_display} + + )} +
+ {book.genre && ( + + {book.genre} + + )} +
+
+ ); + })} +
+ )} +
+ ); +} \ No newline at end of file diff --git a/frontend/src/pages/Reader.tsx b/frontend/src/pages/Reader.tsx new file mode 100644 index 0000000..98332ad --- /dev/null +++ b/frontend/src/pages/Reader.tsx @@ -0,0 +1,64 @@ +import React, { useCallback, useEffect, useRef, useState } from "react"; +import { useNavigate, useParams } from "react-router-dom"; +import { booksApi } from "../api/books"; +import type { EBookDetail } from "../types/book"; + +export function ReaderPage() { + const { id } = useParams<{ id: string }>(); + const navigate = useNavigate(); + const [book, setBook] = useState(null); + const [loading, setLoading] = useState(true); + const [error, setError] = useState(null); + const progressTimer = useRef | null>(null); + const scrollRef = useRef(null); + const bookId = Number(id); + + const saveProgress = useCallback(async () => { + if (!scrollRef.current || !book) return; + const { scrollTop, scrollHeight, clientHeight } = scrollRef.current; + const position = Math.min(100, Math.round((scrollTop / (scrollHeight - clientHeight)) * 100)); + try { await booksApi.updateProgress(bookId, { current_position: position }); } catch { /* silent */ } + }, [bookId, book]); + + useEffect(() => { + const loadBook = async () => { + setLoading(true); setError(null); + try { + const data = await booksApi.getEBook(bookId); + setBook(data); + document.title = data.title; + } catch (err) { setError(err instanceof Error ? err.message : "Failed to load book"); } + finally { setLoading(false); } + }; + void loadBook(); + return () => { document.title = "Cloud Reader"; }; + }, [bookId]); + + useEffect(() => { + progressTimer.current = setInterval(() => { void saveProgress(); }, 5000); + return () => { if (progressTimer.current) clearInterval(progressTimer.current); }; + }, [saveProgress]); + + useEffect(() => { + const handleBeforeUnload = () => { void saveProgress(); }; + window.addEventListener("beforeunload", handleBeforeUnload); + return () => window.removeEventListener("beforeunload", handleBeforeUnload); + }, [saveProgress]); + + if (loading) return

Loading book...

; + if (error) return

{error}

; + if (!book) return null; + + return ( +
+
+ +

{book.title}

{book.author}

+ +
+
+ {book.file_url ?