Merge pull request 'added diaper overview page' (#16) from add-diaper-change-overview into main

Reviewed-on: #16

README.md

@@ -37,8 +37,6 @@ open http://localhost:8000
 ### Using Docker Compose
 
 ```yaml
-version: "3.8"
-
 services:
   baby-monitor:
     image: gitea.gt-proj.com/brian/baby-monitor:latest

docker-compose.prod.yml

@@ -0,0 +1,60 @@
+services:
+  app:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8000:8000"
+    volumes:
+      # Persist database to local directory
+      - ./data:/data
+    environment:
+      # Set environment to production
+      - ENVIRONMENT=production
+      # Set admin credentials
+      - ADMIN_USERNAME=admin
+      - ADMIN_PASSWORD=password
+      # Use Redis for token storage
+      - REDIS_URI=redis://redis:6379/0
+      # Use PostgreSQL for database
+      - DATABASE_URL=postgresql://baby_monitor:securepassword@postgres:5432/baby_monitor_db
+    command: ["--host", "0.0.0.0", "--port", "8000"]
+    restart: unless-stopped
+    depends_on:
+      redis:
+        condition: service_healthy
+      postgres:
+        condition: service_healthy
+  redis:
+    image: redis:7-alpine
+    ports:
+      - "6379:6379"
+    volumes:
+      - redis-data:/data
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD", "redis-cli", "ping"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 1s
+  postgres:
+    image: postgres:14-alpine
+    environment:
+      - POSTGRES_USER=baby_monitor
+      - POSTGRES_PASSWORD=securepassword
+      - POSTGRES_DB=baby_monitor_db
+    ports:
+      - "5432:5432"
+    volumes:
+      - pgdata:/var/lib/postgresql/data
+    restart: unless-stopped
+    healthcheck:
+      test: ["CMD-SHELL", "pg_isready -U baby_monitor -d baby_monitor_db"]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 10s
+volumes:
+  redis-data:
+  pgdata:

docker-compose.yml

@@ -11,23 +11,10 @@ services:
       # Persist database to local directory
       - ./data:/data
     environment:
+      # Set environment to development for hot-reloading and debug features
       - ENVIRONMENT=development
       # Optional: Override admin credentials for development
       - ADMIN_USERNAME=admin
       - ADMIN_PASSWORD=password
-      # Optional: Use Redis for token storage (uncomment redis service below)
-      # - REDIS_URI=redis://redis:6379/0
     command: ["--host", "0.0.0.0", "--port", "8000", "--reload"]
     restart: unless-stopped
-
-  # Uncomment to enable Redis token storage
-  # redis:
-  #   image: redis:7-alpine
-  #   ports:
-  #     - "6379:6379"
-  #   volumes:
-  #     - redis-data:/data
-  #   restart: unless-stopped
-# Uncomment if using Redis
-# volumes:
-#   redis-data:

src/baby_monitor/main.py

@@ -12,6 +12,9 @@ from fastapi.staticfiles import StaticFiles
 from baby_monitor.routers.auth import router as auth_router
 from baby_monitor.routers.auth import verify_token
 from baby_monitor.routers.admin import router as admin_router
+from baby_monitor.routers.child import router as child_router
+from baby_monitor.routers.feeding import router as feeding_router
+from baby_monitor.routers.diaper_change import router as diaper_change_router
 from baby_monitor.routers.health import router as health_router
 from baby_monitor.repositories.dependencies.get_database import init_db
 
@@ -47,6 +50,9 @@ app.mount("/static", StaticFiles(directory=str(static_path)), name="static")
 # Include routers
 app.include_router(auth_router)
 app.include_router(admin_router)
+app.include_router(child_router)
+app.include_router(feeding_router)
+app.include_router(diaper_change_router)
 app.include_router(health_router)
 
 
@@ -75,6 +81,36 @@ def serve_admin() -> FileResponse:
     return FileResponse(static_path / "admin.html")
 
 
+@app.get("/add-child.html", include_in_schema=False)
+def serve_add_child() -> FileResponse:
+    """Serve the add child page."""
+    return FileResponse(static_path / "add-child.html")
+
+
+@app.get("/log-feeding.html", include_in_schema=False)
+def serve_log_feeding() -> FileResponse:
+    """Serve the log feeding page."""
+    return FileResponse(static_path / "log-feeding.html")
+
+
+@app.get("/feedings.html", include_in_schema=False)
+def serve_feedings() -> FileResponse:
+    """Serve the feedings overview page."""
+    return FileResponse(static_path / "feedings.html")
+
+
+@app.get("/diapers.html", include_in_schema=False)
+def serve_diapers() -> FileResponse:
+    """Serve the diaper changes overview page."""
+    return FileResponse(static_path / "diapers.html")
+
+
+@app.get("/log-diaper.html", include_in_schema=False)
+def serve_log_diaper() -> FileResponse:
+    """Serve the log diaper change page."""
+    return FileResponse(static_path / "log-diaper.html")
+
+
 @app.get("/api/")
 def read_root(token: Annotated[str, Depends(verify_token)]) -> dict:
     """API root endpoint (requires authentication)."""

src/baby_monitor/models/child.py

@@ -0,0 +1,23 @@
+"""Child-related request and response models."""
+
+from datetime import datetime
+from pydantic import BaseModel, Field
+
+
+class CreateChildRequest(BaseModel):
+    """Request model for creating a child."""
+
+    name: str = Field(..., min_length=1, max_length=100)
+    birth_time: datetime
+    birth_weight: float = Field(..., gt=0, description="Birth weight in grams")
+
+
+class ChildResponse(BaseModel):
+    """Response model for child data."""
+
+    id: int
+    name: str
+    birth_time: datetime
+    birth_weight: float
+    user_id: int
+    created_at: datetime

src/baby_monitor/models/db/child.py

@@ -0,0 +1,28 @@
+"""Child database model."""
+
+from typing import TYPE_CHECKING
+from sqlalchemy import Column, Integer, String, DateTime, Float, ForeignKey
+from datetime import datetime
+
+if TYPE_CHECKING:
+    from sqlalchemy.orm import DeclarativeBase
+
+    Base = DeclarativeBase
+else:
+    from baby_monitor.repositories.dependencies.get_database import Base
+
+
+class Child(Base):
+    """Child database model."""
+
+    __tablename__ = "children"
+
+    id = Column(Integer, primary_key=True, index=True)
+    name = Column(String, nullable=False)
+    birth_time = Column(DateTime, nullable=False)
+    birth_weight = Column(Float, nullable=False)  # in grams
+    user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
+    created_at = Column(DateTime, default=datetime.utcnow, nullable=False)
+
+    def __repr__(self) -> str:
+        return f"<Child(id={self.id}, name='{self.name}', user_id={self.user_id})>"

src/baby_monitor/models/db/diaper_change.py

@@ -0,0 +1,30 @@
+"""Diaper change database model."""
+
+from typing import TYPE_CHECKING
+from sqlalchemy import Column, Integer, DateTime, ForeignKey, String
+from datetime import datetime, UTC
+
+if TYPE_CHECKING:
+    from sqlalchemy.orm import DeclarativeBase
+
+    Base = DeclarativeBase
+else:
+    from baby_monitor.repositories.dependencies.get_database import Base
+
+
+class DiaperChange(Base):
+    """Diaper change log database model."""
+
+    __tablename__ = "diaper_changes"
+
+    id = Column(Integer, primary_key=True, index=True)
+    child_id = Column(Integer, ForeignKey("children.id"), nullable=False)
+    change_time = Column(DateTime, nullable=False)
+    poop_amount = Column(String, nullable=True)  # stores PoopAmount enum
+    poop_color = Column(String, nullable=True)  # stores PoopColor enum
+    pee_amount = Column(String, nullable=True)  # stores PeeAmount enum
+    pee_color = Column(String, nullable=True)  # stores PeeColor enum
+    created_at = Column(DateTime, default=datetime.now(UTC), nullable=False)
+
+    def __repr__(self) -> str:
+        return f"<DiaperChange(id={self.id}, child_id={self.child_id})>"

src/baby_monitor/models/db/feeding.py

@@ -0,0 +1,28 @@
+"""Feeding database model."""
+
+from typing import TYPE_CHECKING
+from sqlalchemy import Column, Integer, DateTime, ForeignKey, String
+from datetime import datetime, UTC
+
+if TYPE_CHECKING:
+    from sqlalchemy.orm import DeclarativeBase
+
+    Base = DeclarativeBase
+else:
+    from baby_monitor.repositories.dependencies.get_database import Base
+
+
+class Feeding(Base):
+    """Feeding log database model."""
+
+    __tablename__ = "feedings"
+
+    id = Column(Integer, primary_key=True, index=True)
+    child_id = Column(Integer, ForeignKey("children.id"), nullable=False)
+    start_time = Column(DateTime, nullable=False)
+    end_time = Column(DateTime, nullable=True)
+    feeding_type = Column(String, nullable=False)  # stores FeedingType enum
+    created_at = Column(DateTime, default=datetime.now(UTC), nullable=False)
+
+    def __repr__(self) -> str:
+        return f"<Feeding(id={self.id}, child_id={self.child_id})>"

src/baby_monitor/models/diaper_change.py

@@ -0,0 +1,46 @@
+"""Diaper change-related request and response models."""
+
+from datetime import datetime
+from pydantic import BaseModel, Field
+
+from baby_monitor.models.enums import (
+    PeeAmount,
+    PeeColor,
+    PoopAmount,
+    PoopColor,
+)
+
+
+class CreateDiaperChangeRequest(BaseModel):
+    """Request model for creating a diaper change log."""
+
+    child_id: int = Field(..., gt=0)
+    change_time: datetime
+    poop_amount: PoopAmount | None = None
+    poop_color: PoopColor | None = None
+    pee_amount: PeeAmount | None = None
+    pee_color: PeeColor | None = None
+
+
+class UpdateDiaperChangeRequest(BaseModel):
+    """Request model for updating a diaper change log."""
+
+    change_time: datetime | None = None
+    poop_amount: PoopAmount | None = None
+    poop_color: PoopColor | None = None
+    pee_amount: PeeAmount | None = None
+    pee_color: PeeColor | None = None
+
+
+class DiaperChangeResponse(BaseModel):
+    """Response model for diaper change log data."""
+
+    id: int
+    child_id: int
+    change_time: datetime
+    poop_amount: str | None
+    poop_color: str | None
+    pee_amount: str | None
+    pee_color: str | None
+    created_at: datetime
+    child_name: str | None = None  # Optional, populated when needed

src/baby_monitor/models/enums.py

@@ -0,0 +1,44 @@
+"""Feeding type enumeration."""
+
+from enum import StrEnum
+
+
+class FeedingType(StrEnum):
+    """Enumeration of feeding types."""
+
+    LEFT_BREAST = "left_breast"
+    RIGHT_BREAST = "right_breast"
+    BOTTLE = "bottle"
+
+
+class PoopAmount(StrEnum):
+    """Enumeration of poop amounts."""
+
+    LIGHT = "light"
+    MEDIUM = "medium"
+    HEAVY = "heavy"
+
+
+class PoopColor(StrEnum):
+    """Enumeration of poop colors."""
+
+    BLACK = "black"
+    YELLOW = "yellow"
+    GREEN = "green"
+    BROWN = "brown"
+
+
+class PeeAmount(StrEnum):
+    """Enumeration of pee amounts."""
+
+    LIGHT = "light"
+    MEDIUM = "medium"
+    HEAVY = "heavy"
+
+
+class PeeColor(StrEnum):
+    """Enumeration of pee colors."""
+
+    CLEAR = "clear"
+    YELLOW = "yellow"
+    RED = "red"

src/baby_monitor/models/feeding.py

@@ -0,0 +1,35 @@
+"""Feeding-related request and response models."""
+
+from datetime import datetime
+from pydantic import BaseModel, Field
+
+from baby_monitor.models.enums import FeedingType
+
+
+class CreateFeedingRequest(BaseModel):
+    """Request model for creating a feeding log."""
+
+    child_id: int = Field(..., gt=0)
+    start_time: datetime
+    end_time: datetime | None = None
+    feeding_type: FeedingType
+
+
+class UpdateFeedingRequest(BaseModel):
+    """Request model for updating a feeding log."""
+
+    start_time: datetime | None = None
+    end_time: datetime | None = None
+    feeding_type: FeedingType | None = None
+
+
+class FeedingResponse(BaseModel):
+    """Response model for feeding log data."""
+
+    id: int
+    child_id: int
+    start_time: datetime
+    end_time: datetime | None
+    feeding_type: str
+    created_at: datetime
+    child_name: str | None = None  # Optional, populated when needed

src/baby_monitor/repositories/child/sqlite_child.py

@@ -0,0 +1,111 @@
+"""SQLite implementation of child repository."""
+
+from datetime import datetime
+from sqlalchemy.orm import Session
+
+from baby_monitor.repositories.interfaces.child_repository_interface import (
+    ChildRepositoryInterface,
+)
+from baby_monitor.models.db.child import Child
+
+
+class SQLiteChildRepository(ChildRepositoryInterface):
+    """SQLite implementation for child data access."""
+
+    def __init__(self, db: Session):
+        self.db = db
+
+    def create(
+        self, name: str, birth_time: datetime, birth_weight: float, user_id: int
+    ) -> dict:
+        """Create a new child record."""
+        child = Child(
+            name=name,
+            birth_time=birth_time,
+            birth_weight=birth_weight,
+            user_id=user_id,
+        )
+        self.db.add(child)
+        self.db.commit()
+        self.db.refresh(child)
+
+        return {
+            "id": child.id,
+            "name": child.name,
+            "birth_time": child.birth_time,
+            "birth_weight": child.birth_weight,
+            "user_id": child.user_id,
+            "created_at": child.created_at,
+        }
+
+    def get_by_id(self, child_id: int) -> dict | None:
+        """Get a child by ID."""
+        child = self.db.query(Child).filter(Child.id == child_id).first()
+        if not child:
+            return None
+
+        return {
+            "id": child.id,
+            "name": child.name,
+            "birth_time": child.birth_time,
+            "birth_weight": child.birth_weight,
+            "user_id": child.user_id,
+            "created_at": child.created_at,
+        }
+
+    def get_by_user_id(self, user_id: int) -> list[dict]:
+        """Get all children for a specific user."""
+        children = self.db.query(Child).filter(Child.user_id == user_id).all()
+
+        return [
+            {
+                "id": child.id,
+                "name": child.name,
+                "birth_time": child.birth_time,
+                "birth_weight": child.birth_weight,
+                "user_id": child.user_id,
+                "created_at": child.created_at,
+            }
+            for child in children
+        ]
+
+    def update(
+        self,
+        child_id: int,
+        name: str | None = None,
+        birth_time: datetime | None = None,
+        birth_weight: float | None = None,
+    ) -> dict | None:
+        """Update a child record."""
+        child = self.db.query(Child).filter(Child.id == child_id).first()
+        if not child:
+            return None
+
+        if name is not None:
+            child.name = name  # type: ignore[assignment]
+        if birth_time is not None:
+            child.birth_time = birth_time  # type: ignore[assignment]
+        if birth_weight is not None:
+            child.birth_weight = birth_weight  # type: ignore[assignment]
+
+        self.db.commit()
+        self.db.refresh(child)
+
+        return {
+            "id": child.id,
+            "name": child.name,
+            "birth_time": child.birth_time,
+            "birth_weight": child.birth_weight,
+            "user_id": child.user_id,
+            "created_at": child.created_at,
+        }
+
+    def delete(self, child_id: int) -> bool:
+        """Delete a child record."""
+        child = self.db.query(Child).filter(Child.id == child_id).first()
+        if not child:
+            return False
+
+        self.db.delete(child)
+        self.db.commit()
+        return True

src/baby_monitor/repositories/dependencies/get_child_repository.py

@@ -0,0 +1,15 @@
+"""Dependency for getting child repository instance."""
+
+from typing import Annotated
+from fastapi import Depends
+from sqlalchemy.orm import Session
+
+from baby_monitor.repositories.dependencies.get_database import get_database
+from baby_monitor.repositories.child.sqlite_child import SQLiteChildRepository
+
+
+def get_child_repository(
+    db: Annotated[Session, Depends(get_database)],
+) -> SQLiteChildRepository:
+    """Get child repository instance."""
+    return SQLiteChildRepository(db)

src/baby_monitor/repositories/dependencies/get_database.py

@@ -34,10 +34,10 @@ def _ensure_admin_user() -> None:
     """Create or update admin user from environment variables."""
     from baby_monitor.models.db.user import User
     from baby_monitor.utils.password import hash_password
-    
+
     admin_username = os.getenv("ADMIN_USERNAME")
     admin_password = os.getenv("ADMIN_PASSWORD")
-    
+
     if not admin_username:
         raise RuntimeError(
             "ADMIN_USERNAME environment variable is required but not set"
@@ -46,16 +46,14 @@ def _ensure_admin_user() -> None:
         raise RuntimeError(
             "ADMIN_PASSWORD environment variable is required but not set"
         )
-    
+
     db = SessionLocal()
     try:
         # Check if admin user exists
-        admin_user = db.query(User).filter(
-            User.username == admin_username
-        ).first()
-        
+        admin_user = db.query(User).filter(User.username == admin_username).first()
+
         hashed_pw = hash_password(admin_password)
-        
+
         if admin_user:
             # Update existing admin user's password and ensure admin flag
             admin_user.hashed_password = hashed_pw  # type: ignore[assignment]
@@ -79,12 +77,15 @@ def init_db() -> None:
     # Import models to register them with Base.metadata
     # This must be done before create_all() is called
     from baby_monitor.models.db.user import User  # noqa: F401
+    from baby_monitor.models.db.child import Child  # noqa: F401
+    from baby_monitor.models.db.feeding import Feeding  # noqa: F401
+    from baby_monitor.models.db.diaper_change import DiaperChange  # noqa: F401
     from baby_monitor.models.invitation import Invitation  # noqa: F401
 
     # Ensure data directory exists
     DATA_DIR.mkdir(parents=True, exist_ok=True)
     Base.metadata.create_all(bind=engine)
-    
+
     # Create admin user if it doesn't exist
     _ensure_admin_user()
 

src/baby_monitor/repositories/dependencies/get_diaper_change_repository.py

@@ -0,0 +1,17 @@
+"""Dependency for getting diaper change repository instance."""
+
+from typing import Annotated
+from fastapi import Depends
+from sqlalchemy.orm import Session
+
+from baby_monitor.repositories.dependencies.get_database import get_database
+from baby_monitor.repositories.diaper_change.sqlite_diaper_change import (
+    SQLiteDiaperChangeRepository,
+)
+
+
+def get_diaper_change_repository(
+    db: Annotated[Session, Depends(get_database)],
+) -> SQLiteDiaperChangeRepository:
+    """Get diaper change repository instance."""
+    return SQLiteDiaperChangeRepository(db)

src/baby_monitor/repositories/dependencies/get_feeding_repository.py

@@ -0,0 +1,17 @@
+"""Dependency for getting feeding repository instance."""
+
+from typing import Annotated
+from fastapi import Depends
+from sqlalchemy.orm import Session
+
+from baby_monitor.repositories.dependencies.get_database import get_database
+from baby_monitor.repositories.feeding.sqlite_feeding import (
+    SQLiteFeedingRepository,
+)
+
+
+def get_feeding_repository(
+    db: Annotated[Session, Depends(get_database)],
+) -> SQLiteFeedingRepository:
+    """Get feeding repository instance."""
+    return SQLiteFeedingRepository(db)

src/baby_monitor/repositories/diaper_change/sqlite_diaper_change.py

@@ -0,0 +1,133 @@
+"""SQLite implementation of diaper change repository."""
+
+from datetime import datetime
+from sqlalchemy.orm import Session
+
+from baby_monitor.repositories.interfaces.diaper_change_repository_interface import (  # noqa: E501
+    DiaperChangeRepositoryInterface,
+)
+from baby_monitor.models.db.diaper_change import DiaperChange
+from baby_monitor.models.db.child import Child
+
+
+class SQLiteDiaperChangeRepository(DiaperChangeRepositoryInterface):
+    """SQLite implementation for diaper change log data access."""
+
+    def __init__(self, db: Session):
+        self.db = db
+
+    def create(
+        self,
+        child_id: int,
+        change_time: datetime,
+        poop_amount: str | None = None,
+        poop_color: str | None = None,
+        pee_amount: str | None = None,
+        pee_color: str | None = None,
+    ) -> dict:
+        """Create a new diaper change log entry."""
+        diaper_change = DiaperChange(
+            child_id=child_id,
+            change_time=change_time,
+            poop_amount=poop_amount,
+            poop_color=poop_color,
+            pee_amount=pee_amount,
+            pee_color=pee_color,
+        )
+        self.db.add(diaper_change)
+        self.db.commit()
+        self.db.refresh(diaper_change)
+
+        return self._to_dict(diaper_change)
+
+    def get_by_id(self, diaper_change_id: int) -> dict | None:
+        """Get a diaper change log by ID."""
+        diaper_change = (
+            self.db.query(DiaperChange)
+            .filter(DiaperChange.id == diaper_change_id)
+            .first()
+        )
+        if not diaper_change:
+            return None
+        return self._to_dict(diaper_change)
+
+    def get_by_child_id(self, child_id: int) -> list[dict]:
+        """Get all diaper change logs for a specific child."""
+        diaper_changes = (
+            self.db.query(DiaperChange)
+            .filter(DiaperChange.child_id == child_id)
+            .order_by(DiaperChange.change_time.desc())
+            .all()
+        )
+        return [self._to_dict(dc) for dc in diaper_changes]
+
+    def get_by_user_id(self, user_id: int) -> list[dict]:
+        """Get all diaper change logs for a specific user's children."""
+        diaper_changes = (
+            self.db.query(DiaperChange)
+            .join(Child)
+            .filter(Child.user_id == user_id)
+            .order_by(DiaperChange.change_time.desc())
+            .all()
+        )
+        return [self._to_dict(dc) for dc in diaper_changes]
+
+    def update(
+        self,
+        diaper_change_id: int,
+        change_time: datetime | None = None,
+        poop_amount: str | None = None,
+        poop_color: str | None = None,
+        pee_amount: str | None = None,
+        pee_color: str | None = None,
+    ) -> dict | None:
+        """Update a diaper change log entry."""
+        diaper_change = (
+            self.db.query(DiaperChange)
+            .filter(DiaperChange.id == diaper_change_id)
+            .first()
+        )
+        if not diaper_change:
+            return None
+
+        if change_time is not None:
+            diaper_change.change_time = change_time  # type: ignore[assignment]
+        if poop_amount is not None:
+            diaper_change.poop_amount = poop_amount  # type: ignore[assignment]
+        if poop_color is not None:
+            diaper_change.poop_color = poop_color  # type: ignore[assignment]
+        if pee_amount is not None:
+            diaper_change.pee_amount = pee_amount  # type: ignore[assignment]
+        if pee_color is not None:
+            diaper_change.pee_color = pee_color  # type: ignore[assignment]
+
+        self.db.commit()
+        self.db.refresh(diaper_change)
+        return self._to_dict(diaper_change)
+
+    def delete(self, diaper_change_id: int) -> bool:
+        """Delete a diaper change log entry."""
+        diaper_change = (
+            self.db.query(DiaperChange)
+            .filter(DiaperChange.id == diaper_change_id)
+            .first()
+        )
+        if not diaper_change:
+            return False
+
+        self.db.delete(diaper_change)
+        self.db.commit()
+        return True
+
+    def _to_dict(self, diaper_change: DiaperChange) -> dict:
+        """Convert DiaperChange model to dictionary."""
+        return {
+            "id": diaper_change.id,
+            "child_id": diaper_change.child_id,
+            "change_time": diaper_change.change_time,
+            "poop_amount": diaper_change.poop_amount,
+            "poop_color": diaper_change.poop_color,
+            "pee_amount": diaper_change.pee_amount,
+            "pee_color": diaper_change.pee_color,
+            "created_at": diaper_change.created_at,
+        }

src/baby_monitor/repositories/feeding/sqlite_feeding.py

@@ -0,0 +1,109 @@
+"""SQLite implementation of feeding repository."""
+
+from datetime import datetime
+from sqlalchemy.orm import Session
+
+from baby_monitor.repositories.interfaces.feeding_repository_interface import (
+    FeedingRepositoryInterface,
+)
+from baby_monitor.models.db.feeding import Feeding
+from baby_monitor.models.db.child import Child
+
+
+class SQLiteFeedingRepository(FeedingRepositoryInterface):
+    """SQLite implementation for feeding log data access."""
+
+    def __init__(self, db: Session):
+        self.db = db
+
+    def create(
+        self,
+        child_id: int,
+        start_time: datetime,
+        feeding_type: str,
+        end_time: datetime | None = None,
+    ) -> dict:
+        """Create a new feeding log entry."""
+        feeding = Feeding(
+            child_id=child_id,
+            start_time=start_time,
+            end_time=end_time,
+            feeding_type=feeding_type,
+        )
+        self.db.add(feeding)
+        self.db.commit()
+        self.db.refresh(feeding)
+
+        return self._to_dict(feeding)
+
+    def get_by_id(self, feeding_id: int) -> dict | None:
+        """Get a feeding log by ID."""
+        feeding = self.db.query(Feeding).filter(Feeding.id == feeding_id).first()
+        if not feeding:
+            return None
+        return self._to_dict(feeding)
+
+    def get_by_child_id(self, child_id: int) -> list[dict]:
+        """Get all feeding logs for a specific child."""
+        feedings = (
+            self.db.query(Feeding)
+            .filter(Feeding.child_id == child_id)
+            .order_by(Feeding.start_time.desc())
+            .all()
+        )
+        return [self._to_dict(feeding) for feeding in feedings]
+
+    def get_by_user_id(self, user_id: int) -> list[dict]:
+        """Get all feeding logs for a specific user's children."""
+        feedings = (
+            self.db.query(Feeding)
+            .join(Child)
+            .filter(Child.user_id == user_id)
+            .order_by(Feeding.start_time.desc())
+            .all()
+        )
+        return [self._to_dict(feeding) for feeding in feedings]
+
+    def update(
+        self,
+        feeding_id: int,
+        start_time: datetime | None = None,
+        end_time: datetime | None = None,
+        feeding_type: str | None = None,
+    ) -> dict | None:
+        """Update a feeding log entry."""
+        feeding = self.db.query(Feeding).filter(Feeding.id == feeding_id).first()
+        if not feeding:
+            return None
+
+        if start_time is not None:
+            feeding.start_time = start_time  # type: ignore[assignment]
+        if end_time is not None:
+            feeding.end_time = end_time  # type: ignore[assignment]
+        if feeding_type is not None:
+            feeding.feeding_type = feeding_type  # type: ignore[assignment]
+
+        self.db.commit()
+        self.db.refresh(feeding)
+        return self._to_dict(feeding)
+
+    def delete(self, feeding_id: int) -> bool:
+        """Delete a feeding log entry."""
+        feeding = self.db.query(Feeding).filter(Feeding.id == feeding_id).first()
+        if not feeding:
+            return False
+
+        self.db.delete(feeding)
+        self.db.commit()
+        return True
+
+    def _to_dict(self, feeding: Feeding) -> dict:
+        """Convert Feeding model to dictionary."""
+        return {
+            "id": feeding.id,
+            "child_id": feeding.child_id,
+            "start_time": feeding.start_time,
+            "end_time": feeding.end_time,
+            "feeding_type": feeding.feeding_type,
+            "created_at": feeding.created_at,
+        }

src/baby_monitor/repositories/interfaces/child_repository_interface.py

@@ -0,0 +1,36 @@
+"""Interface for child repository operations."""
+
+from abc import ABC, abstractmethod
+from datetime import datetime
+
+
+class ChildRepositoryInterface(ABC):
+    """Interface for child data access operations."""
+
+    @abstractmethod
+    def create(
+        self, name: str, birth_time: datetime, birth_weight: float, user_id: int
+    ) -> dict:
+        """Create a new child record."""
+
+    @abstractmethod
+    def get_by_id(self, child_id: int) -> dict | None:
+        """Get a child by ID."""
+
+    @abstractmethod
+    def get_by_user_id(self, user_id: int) -> list[dict]:
+        """Get all children for a specific user."""
+
+    @abstractmethod
+    def update(
+        self,
+        child_id: int,
+        name: str | None = None,
+        birth_time: datetime | None = None,
+        birth_weight: float | None = None,
+    ) -> dict | None:
+        """Update a child record."""
+
+    @abstractmethod
+    def delete(self, child_id: int) -> bool:
+        """Delete a child record."""

src/baby_monitor/repositories/interfaces/diaper_change_repository_interface.py

@@ -0,0 +1,48 @@
+"""Interface for diaper change repository operations."""
+
+from abc import ABC, abstractmethod
+from datetime import datetime
+
+
+class DiaperChangeRepositoryInterface(ABC):
+    """Interface for diaper change log data access operations."""
+
+    @abstractmethod
+    def create(
+        self,
+        child_id: int,
+        change_time: datetime,
+        poop_amount: str | None = None,
+        poop_color: str | None = None,
+        pee_amount: str | None = None,
+        pee_color: str | None = None,
+    ) -> dict:
+        """Create a new diaper change log entry."""
+
+    @abstractmethod
+    def get_by_id(self, diaper_change_id: int) -> dict | None:
+        """Get a diaper change log by ID."""
+
+    @abstractmethod
+    def get_by_child_id(self, child_id: int) -> list[dict]:
+        """Get all diaper change logs for a specific child."""
+
+    @abstractmethod
+    def get_by_user_id(self, user_id: int) -> list[dict]:
+        """Get all diaper change logs for a specific user's children."""
+
+    @abstractmethod
+    def update(
+        self,
+        diaper_change_id: int,
+        change_time: datetime | None = None,
+        poop_amount: str | None = None,
+        poop_color: str | None = None,
+        pee_amount: str | None = None,
+        pee_color: str | None = None,
+    ) -> dict | None:
+        """Update a diaper change log entry."""
+
+    @abstractmethod
+    def delete(self, diaper_change_id: int) -> bool:
+        """Delete a diaper change log entry."""

src/baby_monitor/repositories/interfaces/feeding_repository_interface.py

@@ -0,0 +1,44 @@
+"""Interface for feeding repository operations."""
+
+from abc import ABC, abstractmethod
+from datetime import datetime
+
+
+class FeedingRepositoryInterface(ABC):
+    """Interface for feeding log data access operations."""
+
+    @abstractmethod
+    def create(
+        self,
+        child_id: int,
+        start_time: datetime,
+        feeding_type: str,
+        end_time: datetime | None = None,
+    ) -> dict:
+        """Create a new feeding log entry."""
+
+    @abstractmethod
+    def get_by_id(self, feeding_id: int) -> dict | None:
+        """Get a feeding log by ID."""
+
+    @abstractmethod
+    def get_by_child_id(self, child_id: int) -> list[dict]:
+        """Get all feeding logs for a specific child."""
+
+    @abstractmethod
+    def get_by_user_id(self, user_id: int) -> list[dict]:
+        """Get all feeding logs for a specific user's children."""
+
+    @abstractmethod
+    def update(
+        self,
+        feeding_id: int,
+        start_time: datetime | None = None,
+        end_time: datetime | None = None,
+        feeding_type: str | None = None,
+    ) -> dict | None:
+        """Update a feeding log entry."""
+
+    @abstractmethod
+    def delete(self, feeding_id: int) -> bool:
+        """Delete a feeding log entry."""

src/baby_monitor/repositories/token/memory_token.py

@@ -42,7 +42,7 @@ class InMemoryTokenRepository(TokenRepositoryInterface):
 
     def cleanup_expired(self) -> None:
         """Remove expired tokens."""
-        now = datetime.utcnow()
+        now = datetime.now(UTC)
         expired_tokens = [
             token for token, (_, expiry) in self._tokens.items() if now > expiry
         ]

src/baby_monitor/routers/auth.py

@@ -80,16 +80,12 @@ def login(
     # Check if user exists in database
     user = user_repo.get_by_username(credentials.username)
     if not user:
-        raise HTTPException(
-            status_code=401, detail="Invalid username or password"
-        )
-    
+        raise HTTPException(status_code=401, detail="Invalid username or password")
+
     # Verify password using bcrypt
     if not verify_password(credentials.password, user["hashed_password"]):
-        raise HTTPException(
-            status_code=401, detail="Invalid username or password"
-        )
-    
+        raise HTTPException(status_code=401, detail="Invalid username or password")
+
     # Generate a secure random token
     access_token = secrets.token_urlsafe(32)
     token_repo.store(access_token, user_id=user["id"], ttl=3600)

src/baby_monitor/routers/child.py

@@ -0,0 +1,90 @@
+"""Child management router."""
+
+from typing import Annotated
+from fastapi import APIRouter, HTTPException, Depends
+
+from baby_monitor.models.child import CreateChildRequest, ChildResponse
+from baby_monitor.routers.auth import verify_token
+from baby_monitor.repositories.child.sqlite_child import SQLiteChildRepository
+from baby_monitor.repositories.dependencies.get_child_repository import (
+    get_child_repository,
+)
+
+router = APIRouter(prefix="/api/children", tags=["children"])
+
+
+@router.post("", response_model=ChildResponse, status_code=201)
+def create_child(
+    request: CreateChildRequest,
+    user_id: Annotated[int, Depends(verify_token)],
+    child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
+) -> ChildResponse:
+    """Create a new child for the authenticated user."""
+    child = child_repo.create(
+        name=request.name,
+        birth_time=request.birth_time,
+        birth_weight=request.birth_weight,
+        user_id=user_id,
+    )
+
+    return ChildResponse(**child)
+
+
+@router.get("", response_model=list[ChildResponse])
+def get_user_children(
+    user_id: Annotated[int, Depends(verify_token)],
+    child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
+) -> list[ChildResponse]:
+    """Get all children for the authenticated user."""
+    children = child_repo.get_by_user_id(user_id)
+    return [ChildResponse(**child) for child in children]
+
+
+@router.get("/{child_id}", response_model=ChildResponse)
+def get_child(
+    child_id: int,
+    user_id: Annotated[int, Depends(verify_token)],
+    child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
+) -> ChildResponse:
+    """Get a specific child by ID."""
+    child = child_repo.get_by_id(child_id)
+
+    if not child:
+        raise HTTPException(status_code=404, detail="Child not found")
+
+    # Verify the child belongs to the authenticated user
+    if child["user_id"] != user_id:
+        raise HTTPException(status_code=403, detail="Access denied")
+
+    return ChildResponse(**child)
+
+
+@router.put("/{child_id}", response_model=ChildResponse)
+def update_child(
+    child_id: int,
+    request: CreateChildRequest,
+    user_id: Annotated[int, Depends(verify_token)],
+    child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
+) -> ChildResponse:
+    """Update a child's information."""
+    # First check if child exists and belongs to user
+    child = child_repo.get_by_id(child_id)
+
+    if not child:
+        raise HTTPException(status_code=404, detail="Child not found")
+
+    if child["user_id"] != user_id:
+        raise HTTPException(status_code=403, detail="Access denied")
+
+    # Update the child
+    updated_child = child_repo.update(
+        child_id=child_id,
+        name=request.name,
+        birth_time=request.birth_time,
+        birth_weight=request.birth_weight,
+    )
+
+    if not updated_child:
+        raise HTTPException(status_code=500, detail="Update failed")
+
+    return ChildResponse(**updated_child)

src/baby_monitor/routers/diaper_change.py

@@ -0,0 +1,153 @@
+"""Diaper change log management router."""
+
+from typing import Annotated
+from fastapi import APIRouter, HTTPException, Depends
+
+from baby_monitor.models.diaper_change import (
+    CreateDiaperChangeRequest,
+    UpdateDiaperChangeRequest,
+    DiaperChangeResponse,
+)
+from baby_monitor.routers.auth import verify_token
+from baby_monitor.repositories.diaper_change.sqlite_diaper_change import (
+    SQLiteDiaperChangeRepository,
+)
+from baby_monitor.repositories.dependencies.get_diaper_change_repository import (  # noqa: E501
+    get_diaper_change_repository,
+)
+from baby_monitor.repositories.child.sqlite_child import SQLiteChildRepository
+from baby_monitor.repositories.dependencies.get_child_repository import (
+    get_child_repository,
+)
+
+router = APIRouter(prefix="/api/diaper-changes", tags=["diaper-changes"])
+
+
+@router.post("", response_model=DiaperChangeResponse, status_code=201)
+def create_diaper_change(
+    request: CreateDiaperChangeRequest,
+    user_id: Annotated[int, Depends(verify_token)],
+    diaper_repo: Annotated[
+        SQLiteDiaperChangeRepository, Depends(get_diaper_change_repository)
+    ],
+    child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
+) -> DiaperChangeResponse:
+    """Create a new diaper change log entry."""
+    # Verify the child belongs to the authenticated user
+    child = child_repo.get_by_id(request.child_id)
+    if not child:
+        raise HTTPException(status_code=404, detail="Child not found")
+
+    if child["user_id"] != user_id:
+        raise HTTPException(status_code=403, detail="Access denied to this child")
+
+    diaper_change = diaper_repo.create(
+        child_id=request.child_id,
+        change_time=request.change_time,
+        poop_amount=request.poop_amount.value if request.poop_amount else None,
+        poop_color=request.poop_color.value if request.poop_color else None,
+        pee_amount=request.pee_amount.value if request.pee_amount else None,
+        pee_color=request.pee_color.value if request.pee_color else None,
+    )
+
+    return DiaperChangeResponse(**diaper_change)
+
+
+@router.get("", response_model=list[DiaperChangeResponse])
+def get_user_diaper_changes(
+    user_id: Annotated[int, Depends(verify_token)],
+    diaper_repo: Annotated[
+        SQLiteDiaperChangeRepository, Depends(get_diaper_change_repository)
+    ],
+) -> list[DiaperChangeResponse]:
+    """Get all diaper change logs for the authenticated user's children."""
+    diaper_changes = diaper_repo.get_by_user_id(user_id)
+    return [DiaperChangeResponse(**dc) for dc in diaper_changes]
+
+
+@router.get("/{diaper_change_id}", response_model=DiaperChangeResponse)
+def get_diaper_change(
+    diaper_change_id: int,
+    user_id: Annotated[int, Depends(verify_token)],
+    diaper_repo: Annotated[
+        SQLiteDiaperChangeRepository, Depends(get_diaper_change_repository)
+    ],
+    child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
+) -> DiaperChangeResponse:
+    """Get a specific diaper change log by ID."""
+    diaper_change = diaper_repo.get_by_id(diaper_change_id)
+
+    if not diaper_change:
+        raise HTTPException(status_code=404, detail="Diaper change log not found")
+
+    # Verify the diaper change belongs to user's child
+    child = child_repo.get_by_id(diaper_change["child_id"])
+    if not child or child["user_id"] != user_id:
+        raise HTTPException(status_code=403, detail="Access denied")
+
+    return DiaperChangeResponse(**diaper_change)
+
+
+@router.put("/{diaper_change_id}", response_model=DiaperChangeResponse)
+def update_diaper_change(
+    diaper_change_id: int,
+    request: UpdateDiaperChangeRequest,
+    user_id: Annotated[int, Depends(verify_token)],
+    diaper_repo: Annotated[
+        SQLiteDiaperChangeRepository, Depends(get_diaper_change_repository)
+    ],
+    child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
+) -> DiaperChangeResponse:
+    """Update an existing diaper change log."""
+    diaper_change = diaper_repo.get_by_id(diaper_change_id)
+
+    if not diaper_change:
+        raise HTTPException(status_code=404, detail="Diaper change log not found")
+
+    # Verify the diaper change belongs to user's child
+    child = child_repo.get_by_id(diaper_change["child_id"])
+    if not child or child["user_id"] != user_id:
+        raise HTTPException(status_code=403, detail="Access denied")
+
+    updated = diaper_repo.update(
+        diaper_change_id=diaper_change_id,
+        change_time=request.change_time,
+        poop_amount=request.poop_amount.value if request.poop_amount else None,
+        poop_color=request.poop_color.value if request.poop_color else None,
+        pee_amount=request.pee_amount.value if request.pee_amount else None,
+        pee_color=request.pee_color.value if request.pee_color else None,
+    )
+
+    if not updated:
+        raise HTTPException(
+            status_code=500, detail="Failed to update diaper change log"
+        )
+
+    return DiaperChangeResponse(**updated)
+
+
+@router.delete("/{diaper_change_id}", status_code=204)
+def delete_diaper_change(
+    diaper_change_id: int,
+    user_id: Annotated[int, Depends(verify_token)],
+    diaper_repo: Annotated[
+        SQLiteDiaperChangeRepository, Depends(get_diaper_change_repository)
+    ],
+    child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
+) -> None:
+    """Delete a diaper change log."""
+    diaper_change = diaper_repo.get_by_id(diaper_change_id)
+
+    if not diaper_change:
+        raise HTTPException(status_code=404, detail="Diaper change log not found")
+
+    # Verify the diaper change belongs to user's child
+    child = child_repo.get_by_id(diaper_change["child_id"])
+    if not child or child["user_id"] != user_id:
+        raise HTTPException(status_code=403, detail="Access denied")
+
+    success = diaper_repo.delete(diaper_change_id)
+    if not success:
+        raise HTTPException(
+            status_code=500, detail="Failed to delete diaper change log"
+        )

src/baby_monitor/routers/feeding.py

@@ -0,0 +1,158 @@
+"""Feeding log management router."""
+
+from typing import Annotated
+from fastapi import APIRouter, HTTPException, Depends
+
+from baby_monitor.models.feeding import (
+    CreateFeedingRequest,
+    UpdateFeedingRequest,
+    FeedingResponse,
+)
+from baby_monitor.routers.auth import verify_token
+from baby_monitor.repositories.feeding.sqlite_feeding import (
+    SQLiteFeedingRepository,
+)
+from baby_monitor.repositories.dependencies.get_feeding_repository import (
+    get_feeding_repository,
+)
+from baby_monitor.repositories.child.sqlite_child import SQLiteChildRepository
+from baby_monitor.repositories.dependencies.get_child_repository import (
+    get_child_repository,
+)
+
+router = APIRouter(prefix="/api/feedings", tags=["feedings"])
+
+
+@router.post("", response_model=FeedingResponse, status_code=201)
+def create_feeding(
+    request: CreateFeedingRequest,
+    user_id: Annotated[int, Depends(verify_token)],
+    feeding_repo: Annotated[SQLiteFeedingRepository, Depends(get_feeding_repository)],
+    child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
+) -> FeedingResponse:
+    """Create a new feeding log entry."""
+    # Verify the child belongs to the authenticated user
+    child = child_repo.get_by_id(request.child_id)
+    if not child:
+        raise HTTPException(status_code=404, detail="Child not found")
+
+    if child["user_id"] != user_id:
+        raise HTTPException(status_code=403, detail="Access denied to this child")
+
+    feeding = feeding_repo.create(
+        child_id=request.child_id,
+        start_time=request.start_time,
+        end_time=request.end_time,
+        feeding_type=request.feeding_type.value,
+    )
+
+    return FeedingResponse(**feeding)
+
+
+@router.get("/active", response_model=FeedingResponse | None)
+def get_active_feeding(
+    user_id: Annotated[int, Depends(verify_token)],
+    feeding_repo: Annotated[SQLiteFeedingRepository, Depends(get_feeding_repository)],
+    child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
+) -> FeedingResponse | None:
+    """Get the current active feeding (where end_time is null) for the user."""
+    feedings = feeding_repo.get_by_user_id(user_id)
+
+    # Find the first feeding with no end_time
+    for feeding in feedings:
+        if feeding["end_time"] is None:
+            # Get child info to include in response
+            child = child_repo.get_by_id(feeding["child_id"])
+            response_data = feeding.copy()
+            if child:
+                response_data["child_name"] = child["name"]
+            return FeedingResponse(**response_data)
+
+    return None
+
+
+@router.get("", response_model=list[FeedingResponse])
+def get_user_feedings(
+    user_id: Annotated[int, Depends(verify_token)],
+    feeding_repo: Annotated[SQLiteFeedingRepository, Depends(get_feeding_repository)],
+) -> list[FeedingResponse]:
+    """Get all feeding logs for the authenticated user's children."""
+    feedings = feeding_repo.get_by_user_id(user_id)
+    return [FeedingResponse(**feeding) for feeding in feedings]
+
+
+@router.get("/{feeding_id}", response_model=FeedingResponse)
+def get_feeding(
+    feeding_id: int,
+    user_id: Annotated[int, Depends(verify_token)],
+    feeding_repo: Annotated[SQLiteFeedingRepository, Depends(get_feeding_repository)],
+    child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
+) -> FeedingResponse:
+    """Get a specific feeding log by ID."""
+    feeding = feeding_repo.get_by_id(feeding_id)
+
+    if not feeding:
+        raise HTTPException(status_code=404, detail="Feeding log not found")
+
+    # Verify the feeding belongs to user's child
+    child = child_repo.get_by_id(feeding["child_id"])
+    if not child or child["user_id"] != user_id:
+        raise HTTPException(status_code=403, detail="Access denied")
+
+    return FeedingResponse(**feeding)
+
+
+@router.put("/{feeding_id}", response_model=FeedingResponse)
+def update_feeding(
+    feeding_id: int,
+    request: UpdateFeedingRequest,
+    user_id: Annotated[int, Depends(verify_token)],
+    feeding_repo: Annotated[SQLiteFeedingRepository, Depends(get_feeding_repository)],
+    child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
+) -> FeedingResponse:
+    """Update a feeding log entry."""
+    feeding = feeding_repo.get_by_id(feeding_id)
+
+    if not feeding:
+        raise HTTPException(status_code=404, detail="Feeding log not found")
+
+    # Verify ownership
+    child = child_repo.get_by_id(feeding["child_id"])
+    if not child or child["user_id"] != user_id:
+        raise HTTPException(status_code=403, detail="Access denied")
+
+    # Update the feeding
+    updated_feeding = feeding_repo.update(
+        feeding_id=feeding_id,
+        start_time=request.start_time,
+        end_time=request.end_time,
+        feeding_type=request.feeding_type.value if request.feeding_type else None,
+    )
+
+    if not updated_feeding:
+        raise HTTPException(status_code=500, detail="Update failed")
+
+    return FeedingResponse(**updated_feeding)
+
+
+@router.delete("/{feeding_id}", status_code=204)
+def delete_feeding(
+    feeding_id: int,
+    user_id: Annotated[int, Depends(verify_token)],
+    feeding_repo: Annotated[SQLiteFeedingRepository, Depends(get_feeding_repository)],
+    child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
+) -> None:
+    """Delete a feeding log entry."""
+    feeding = feeding_repo.get_by_id(feeding_id)
+
+    if not feeding:
+        raise HTTPException(status_code=404, detail="Feeding log not found")
+
+    # Verify ownership
+    child = child_repo.get_by_id(feeding["child_id"])
+    if not child or child["user_id"] != user_id:
+        raise HTTPException(status_code=403, detail="Access denied")
+
+    success = feeding_repo.delete(feeding_id)
+    if not success:
+        raise HTTPException(status_code=500, detail="Delete failed")

src/baby_monitor/static/add-child.html

@@ -0,0 +1,322 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Add Child - Baby Monitor</title>
+    <style>
+      * {
+        margin: 0;
+        padding: 0;
+        box-sizing: border-box;
+      }
+
+      body {
+        font-family:
+          -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
+          Cantarell, sans-serif;
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+        min-height: 100vh;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding: 20px;
+      }
+
+      .container {
+        background: white;
+        border-radius: 12px;
+        box-shadow: 0 10px 40px rgba(0, 0, 0, 0.2);
+        padding: 40px;
+        max-width: 500px;
+        width: 100%;
+      }
+
+      h1 {
+        color: #333;
+        margin-bottom: 10px;
+        font-size: 28px;
+      }
+
+      .subtitle {
+        color: #666;
+        margin-bottom: 30px;
+        font-size: 14px;
+      }
+
+      .form-group {
+        margin-bottom: 20px;
+      }
+
+      label {
+        display: block;
+        margin-bottom: 8px;
+        color: #333;
+        font-weight: 600;
+        font-size: 14px;
+      }
+
+      input {
+        width: 100%;
+        padding: 12px;
+        border: 1px solid #ddd;
+        border-radius: 6px;
+        font-size: 14px;
+        transition: border-color 0.2s;
+      }
+
+      input:focus {
+        outline: none;
+        border-color: #667eea;
+      }
+
+      .button {
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+        color: white;
+        border: none;
+        padding: 12px 24px;
+        border-radius: 6px;
+        font-size: 16px;
+        font-weight: 600;
+        cursor: pointer;
+        transition:
+          transform 0.2s,
+          box-shadow 0.2s;
+        width: 100%;
+        margin-top: 10px;
+      }
+
+      .button:hover {
+        transform: translateY(-2px);
+        box-shadow: 0 4px 12px rgba(102, 126, 234, 0.4);
+      }
+
+      .button:active {
+        transform: translateY(0);
+      }
+
+      .button:disabled {
+        opacity: 0.6;
+        cursor: not-allowed;
+        transform: none;
+      }
+
+      .button.secondary {
+        background: #6c757d;
+        margin-top: 10px;
+      }
+
+      .button.secondary:hover {
+        box-shadow: 0 4px 12px rgba(108, 117, 125, 0.4);
+      }
+
+      .message {
+        padding: 12px;
+        border-radius: 6px;
+        margin-bottom: 20px;
+        display: none;
+      }
+
+      .message.show {
+        display: block;
+      }
+
+      .message.error {
+        background: #ffebee;
+        border-left: 4px solid #f44336;
+        color: #c62828;
+      }
+
+      .message.success {
+        background: #e8f5e9;
+        border-left: 4px solid #4caf50;
+        color: #2e7d32;
+      }
+
+      .help-text {
+        font-size: 12px;
+        color: #666;
+        margin-top: 4px;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="container">
+      <h1>👶 Add Child</h1>
+      <p class="subtitle">Enter your child's information</p>
+
+      <div id="message" class="message"></div>
+
+      <form id="addChildForm">
+        <div class="form-group">
+          <label for="name">Child's Name *</label>
+          <input
+            type="text"
+            id="name"
+            name="name"
+            required
+            placeholder="Enter child's name"
+            maxlength="100"
+          />
+        </div>
+
+        <div class="form-group">
+          <label for="birthTime">Date and Time of Birth *</label>
+          <input
+            type="datetime-local"
+            id="birthTime"
+            name="birthTime"
+            required
+          />
+          <p class="help-text">
+            Select the date and time when your child was born
+          </p>
+        </div>
+
+        <div class="form-group">
+          <label for="birthWeight">Birth Weight (grams) *</label>
+          <input
+            type="number"
+            id="birthWeight"
+            name="birthWeight"
+            required
+            min="1"
+            step="1"
+            placeholder="e.g., 3500"
+          />
+          <p class="help-text">Enter weight in grams (1 kg = 1000 grams)</p>
+        </div>
+
+        <button type="submit" class="button" id="submitBtn">Add Child</button>
+        <button type="button" class="button secondary" onclick="goBack()">
+          Cancel
+        </button>
+      </form>
+    </div>
+
+    <script>
+      // Check if user is authenticated
+      const token = localStorage.getItem("access_token");
+      if (!token) {
+        window.location.href = "/login.html";
+      }
+
+      // Get child ID from URL if editing
+      const urlParams = new URLSearchParams(window.location.search);
+      const childId = urlParams.get("id");
+      const isEditMode = !!childId;
+
+      const form = document.getElementById("addChildForm");
+      const messageDiv = document.getElementById("message");
+      const submitBtn = document.getElementById("submitBtn");
+
+      // Update page title and button text if editing
+      if (isEditMode) {
+        document.querySelector("h1").textContent = "✏️ Edit Child";
+        document.querySelector(".subtitle").textContent =
+          "Update your child's information";
+        submitBtn.textContent = "Update Child";
+
+        // Load existing child data
+        loadChildData(childId);
+      }
+
+      async function loadChildData(id) {
+        try {
+          const response = await fetch(`/api/children/${id}`, {
+            headers: {
+              Authorization: `Bearer ${token}`,
+            },
+          });
+
+          if (response.ok) {
+            const child = await response.json();
+
+            // Populate form fields
+            document.getElementById("name").value = child.name;
+
+            // Format datetime for datetime-local input
+            const birthDate = new Date(child.birth_time);
+            const formattedDate = birthDate.toISOString().slice(0, 16);
+            document.getElementById("birthTime").value = formattedDate;
+
+            document.getElementById("birthWeight").value = child.birth_weight;
+          } else {
+            showMessage("Failed to load child data", "error");
+          }
+        } catch (error) {
+          showMessage("Error loading child data", "error");
+        }
+      }
+
+      form.addEventListener("submit", async (e) => {
+        e.preventDefault();
+
+        const name = document.getElementById("name").value;
+        const birthTime = document.getElementById("birthTime").value;
+        const birthWeight = parseFloat(
+          document.getElementById("birthWeight").value,
+        );
+
+        // Disable button during request
+        submitBtn.disabled = true;
+        const originalText = submitBtn.textContent;
+        submitBtn.textContent = isEditMode ? "Updating..." : "Adding...";
+        messageDiv.classList.remove("show");
+
+        try {
+          const url = isEditMode ? `/api/children/${childId}` : "/api/children";
+          const method = isEditMode ? "PUT" : "POST";
+
+          const response = await fetch(url, {
+            method: method,
+            headers: {
+              "Content-Type": "application/json",
+              Authorization: `Bearer ${token}`,
+            },
+            body: JSON.stringify({
+              name: name,
+              birth_time: birthTime,
+              birth_weight: birthWeight,
+            }),
+          });
+
+          const data = await response.json();
+
+          if (response.ok) {
+            showMessage(
+              isEditMode
+                ? "Child updated successfully!"
+                : "Child added successfully!",
+              "success",
+            );
+            // Redirect to home page after 1 second
+            setTimeout(() => {
+              window.location.href = "/";
+            }, 1000);
+          } else {
+            showMessage(
+              data.detail ||
+                `Failed to ${isEditMode ? "update" : "add"} child. Please try again.`,
+              "error",
+            );
+          }
+        } catch (error) {
+          showMessage("Network error. Please try again.", "error");
+        } finally {
+          submitBtn.disabled = false;
+          submitBtn.textContent = originalText;
+        }
+      });
+
+      function showMessage(text, type) {
+        messageDiv.textContent = text;
+        messageDiv.className = `message ${type} show`;
+      }
+
+      function goBack() {
+        window.location.href = "/";
+      }
+    </script>
+  </body>
+</html>

src/baby_monitor/static/index.html

@@ -117,6 +117,92 @@
         text-align: center;
         padding: 2rem;
       }
+      .feeding-button {
+        width: 100%;
+        padding: 2rem;
+        font-size: 1.5rem;
+        margin-bottom: 1.5rem;
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+        border-radius: 8px;
+        transition:
+          transform 0.2s,
+          box-shadow 0.2s;
+      }
+      .feeding-button:hover {
+        transform: translateY(-2px);
+        box-shadow: 0 6px 20px rgba(102, 126, 234, 0.4);
+        background: linear-gradient(135deg, #764ba2 0%, #667eea 100%);
+      }
+      .feeding-button.active {
+        background: linear-gradient(135deg, #f44336 0%, #e91e63 100%);
+      }
+      .feeding-button.active:hover {
+        background: linear-gradient(135deg, #e91e63 0%, #f44336 100%);
+      }
+      .feeding-info {
+        font-size: 0.9rem;
+        margin-top: 0.5rem;
+        opacity: 0.9;
+      }
+      .modal {
+        display: none;
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background: rgba(0, 0, 0, 0.5);
+        z-index: 1001;
+        justify-content: center;
+        align-items: center;
+      }
+      .modal.show {
+        display: flex;
+      }
+      .modal-content {
+        background: white;
+        padding: 2rem;
+        border-radius: 8px;
+        max-width: 400px;
+        width: 90%;
+        box-shadow: 0 10px 40px rgba(0, 0, 0, 0.3);
+      }
+      .modal h2 {
+        margin-top: 0;
+        margin-bottom: 1.5rem;
+        color: #333;
+      }
+      .form-group {
+        margin-bottom: 1rem;
+      }
+      .form-group label {
+        display: block;
+        margin-bottom: 0.5rem;
+        color: #333;
+        font-weight: 600;
+      }
+      .form-group select {
+        width: 100%;
+        padding: 0.75rem;
+        border: 1px solid #ddd;
+        border-radius: 4px;
+        font-size: 1rem;
+      }
+      .modal-buttons {
+        display: flex;
+        gap: 0.5rem;
+        margin-top: 1.5rem;
+      }
+      .modal-buttons button {
+        flex: 1;
+        margin: 0;
+      }
+      .cancel-button {
+        background-color: #6c757d;
+      }
+      .cancel-button:hover {
+        background-color: #5a6268;
+      }
     </style>
   </head>
   <body>
@@ -129,6 +215,9 @@
     <div class="menu-backdrop" id="menuBackdrop"></div>
 
     <div class="menu-overlay" id="menuOverlay">
+      <div class="menu-item" id="menuAddChild">👶 Add Child</div>
+      <div class="menu-item" id="menuFeedings">🍼 Feedings</div>
+      <div class="menu-item" id="menuDiapers">🧷 Diapers</div>
       <div class="menu-item logout" id="menuLogout">🚪 Logout</div>
     </div>
 
@@ -138,6 +227,40 @@
       </div>
     </div>
 
+    <!-- Start Feeding Modal -->
+    <div class="modal" id="startFeedingModal">
+      <div class="modal-content">
+        <h2>🍼 Start Feeding</h2>
+        <form id="startFeedingForm">
+          <div class="form-group">
+            <label for="modalChildId">Child</label>
+            <select id="modalChildId" required>
+              <option value="">Select a child</option>
+            </select>
+          </div>
+          <div class="form-group">
+            <label for="modalFeedingType">Feeding Type</label>
+            <select id="modalFeedingType" required>
+              <option value="">Select type</option>
+              <option value="left_breast">Left Breast</option>
+              <option value="right_breast">Right Breast</option>
+              <option value="bottle">Bottle</option>
+            </select>
+          </div>
+          <div class="modal-buttons">
+            <button
+              type="button"
+              class="cancel-button"
+              onclick="closeStartFeedingModal()"
+            >
+              Cancel
+            </button>
+            <button type="submit">Start</button>
+          </div>
+        </form>
+      </div>
+    </div>
+
     <script>
       const token = localStorage.getItem("access_token");
       const username = localStorage.getItem("username");
@@ -160,6 +283,18 @@
       burgerMenu.addEventListener("click", toggleMenu);
       menuBackdrop.addEventListener("click", closeMenu);
 
+      document.getElementById("menuAddChild").addEventListener("click", () => {
+        window.location.href = "/add-child.html";
+      });
+
+      document.getElementById("menuFeedings").addEventListener("click", () => {
+        window.location.href = "/feedings.html";
+      });
+
+      document.getElementById("menuDiapers").addEventListener("click", () => {
+        window.location.href = "/diapers.html";
+      });
+
       document.getElementById("menuLogout").addEventListener("click", () => {
         closeMenu();
         logout();
@@ -187,20 +322,274 @@
             }
           })
           .then((user) => {
-            // Show authenticated content
-            document.getElementById("content").innerHTML = `
-                    <h1>Welcome to Baby Monitor!</h1>
-                    <div class="user-info">
-                        <p><strong>Logged in as:</strong> ${username}</p>
-                    </div>
-                    <p>Your session is active.</p>
-                `;
+            // Check if user has any children
+            return fetch("/api/children", {
+              headers: {
+                Authorization: `Bearer ${token}`,
+              },
+            })
+              .then((response) => response.json())
+              .then((children) => {
+                // If no children, redirect to add-child page
+                if (children.length === 0) {
+                  window.location.href = "/add-child.html";
+                  return;
+                }
+
+                // Load feeding status and show content
+                loadFeedingStatus(children);
+              });
           })
           .catch((error) => {
             console.error("Error:", error);
           });
       }
 
+      let activeFeeding = null;
+      let userChildren = [];
+      let lastFeeding = null;
+      let updateTimerInterval = null;
+
+      async function loadFeedingStatus(children) {
+        userChildren = children;
+
+        try {
+          // Fetch active feeding
+          const activeResponse = await fetch("/api/feedings/active", {
+            headers: {
+              Authorization: `Bearer ${token}`,
+            },
+          });
+
+          if (activeResponse.ok) {
+            activeFeeding = await activeResponse.json();
+          }
+
+          // Fetch all feedings to get the last one
+          const feedingsResponse = await fetch("/api/feedings", {
+            headers: {
+              Authorization: `Bearer ${token}`,
+            },
+          });
+
+          if (feedingsResponse.ok) {
+            const feedings = await feedingsResponse.json();
+            if (feedings.length > 0) {
+              // Feedings are ordered by start_time desc, so first is most recent
+              lastFeeding = feedings[0];
+            }
+          }
+        } catch (error) {
+          console.error("Error loading feeding status:", error);
+        }
+
+        renderContent();
+        startUpdateTimer();
+      }
+
+      function startUpdateTimer() {
+        // Clear any existing timer
+        if (updateTimerInterval) {
+          clearInterval(updateTimerInterval);
+        }
+
+        // Update every 30 seconds if there's an active feeding
+        if (activeFeeding) {
+          updateTimerInterval = setInterval(() => {
+            if (activeFeeding) {
+              updateFeedingTimeDisplay();
+            } else {
+              clearInterval(updateTimerInterval);
+              updateTimerInterval = null;
+            }
+          }, 30000); // Update every 30 seconds
+        }
+      }
+
+      function updateFeedingTimeDisplay() {
+        const timeElement = document.getElementById("feedingTimeInfo");
+        if (timeElement && activeFeeding) {
+          timeElement.textContent = formatTime(activeFeeding.start_time);
+        }
+      }
+
+      function renderContent() {
+        const feedingButtonHtml = activeFeeding
+          ? `
+            <button class="feeding-button active" onclick="stopFeeding()">
+              🛑 Stop Feeding
+              <div class="feeding-info">
+                ${activeFeeding.child_name || "Child"} - ${formatFeedingType(activeFeeding.feeding_type)}<br>
+                Started <span id="feedingTimeInfo">${formatTime(activeFeeding.start_time)}</span>
+              </div>
+            </button>
+          `
+          : `
+            <button class="feeding-button" onclick="showStartFeedingModal()">
+              ▶️ Start Feeding
+            </button>
+          `;
+
+        document.getElementById("content").innerHTML = `
+          <h1>Welcome to Baby Monitor!</h1>
+          <div class="user-info">
+            <p><strong>Logged in as:</strong> ${username}</p>
+          </div>
+          ${feedingButtonHtml}
+          <button class="feeding-button" onclick="window.location.href='/log-diaper.html'" style="background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%); margin-top: 20px;">
+            🧷 Log Diaper Change
+          </button>
+        `;
+      }
+
+      function formatFeedingType(type) {
+        const types = {
+          left_breast: "Left Breast",
+          right_breast: "Right Breast",
+          bottle: "Bottle",
+        };
+        return types[type] || type;
+      }
+
+      function formatTime(dateString) {
+        const date = new Date(dateString);
+        const now = new Date();
+        const diffMs = now - date;
+        const diffMins = Math.floor(diffMs / 60000);
+
+        if (diffMins < 1) return "just now";
+        if (diffMins < 60) return `${diffMins} min ago`;
+
+        const diffHours = Math.floor(diffMins / 60);
+        if (diffHours < 24) return `${diffHours}h ${diffMins % 60}m ago`;
+
+        return date.toLocaleString();
+      }
+
+      function showStartFeedingModal() {
+        const modal = document.getElementById("startFeedingModal");
+        const childSelect = document.getElementById("modalChildId");
+        const typeSelect = document.getElementById("modalFeedingType");
+
+        // Clear and populate child select
+        childSelect.innerHTML = '<option value="">Select a child</option>';
+        userChildren.forEach((child) => {
+          const option = document.createElement("option");
+          option.value = child.id;
+          option.textContent = child.name;
+          childSelect.appendChild(option);
+        });
+
+        // Set defaults based on last feeding
+        if (lastFeeding) {
+          childSelect.value = lastFeeding.child_id;
+          typeSelect.value = lastFeeding.feeding_type;
+        }
+
+        modal.classList.add("show");
+      }
+
+      function closeStartFeedingModal() {
+        const modal = document.getElementById("startFeedingModal");
+        modal.classList.remove("show");
+        document.getElementById("startFeedingForm").reset();
+      }
+
+      document
+        .getElementById("startFeedingForm")
+        .addEventListener("submit", async (e) => {
+          e.preventDefault();
+
+          const childId = parseInt(
+            document.getElementById("modalChildId").value,
+          );
+          const feedingType = document.getElementById("modalFeedingType").value;
+
+          try {
+            const now = new Date();
+            const localDateTime = new Date(
+              now.getTime() - now.getTimezoneOffset() * 60000,
+            )
+              .toISOString()
+              .slice(0, 19);
+
+            const response = await fetch("/api/feedings", {
+              method: "POST",
+              headers: {
+                "Content-Type": "application/json",
+                Authorization: `Bearer ${token}`,
+              },
+              body: JSON.stringify({
+                child_id: childId,
+                start_time: localDateTime,
+                end_time: null,
+                feeding_type: feedingType,
+              }),
+            });
+
+            if (response.ok) {
+              const feeding = await response.json();
+              activeFeeding = feeding;
+              lastFeeding = feeding; // Update last feeding
+
+              // Add child name to active feeding
+              const child = userChildren.find((c) => c.id === childId);
+              if (child) {
+                activeFeeding.child_name = child.name;
+              }
+
+              closeStartFeedingModal();
+              renderContent();
+              startUpdateTimer(); // Start the timer for live updates
+            } else {
+              const data = await response.json();
+              alert(data.detail || "Failed to start feeding");
+            }
+          } catch (error) {
+            console.error("Error starting feeding:", error);
+            alert("Network error. Please try again.");
+          }
+        });
+
+      async function stopFeeding() {
+        if (!activeFeeding) return;
+
+        try {
+          const now = new Date();
+          const localDateTime = new Date(
+            now.getTime() - now.getTimezoneOffset() * 60000,
+          )
+            .toISOString()
+            .slice(0, 19);
+
+          const response = await fetch(`/api/feedings/${activeFeeding.id}`, {
+            method: "PUT",
+            headers: {
+              "Content-Type": "application/json",
+              Authorization: `Bearer ${token}`,
+            },
+            body: JSON.stringify({
+              end_time: localDateTime,
+            }),
+          });
+
+          if (response.ok) {
+            activeFeeding = null;
+            if (updateTimerInterval) {
+              clearInterval(updateTimerInterval);
+              updateTimerInterval = null;
+            }
+            renderContent();
+          } else {
+            const data = await response.json();
+            alert(data.detail || "Failed to stop feeding");
+          }
+        } catch (error) {
+          console.error("Error stopping feeding:", error);
+          alert("Network error. Please try again.");
+        }
+      }
+
       async function logout() {
         const token = localStorage.getItem("access_token");
 

src/baby_monitor/static/log-diaper.html

@@ -0,0 +1,454 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Log Diaper Change - Baby Monitor</title>
+    <style>
+      * {
+        margin: 0;
+        padding: 0;
+        box-sizing: border-box;
+      }
+
+      body {
+        font-family:
+          -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
+          Cantarell, sans-serif;
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+        min-height: 100vh;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding: 20px;
+      }
+
+      .container {
+        background: white;
+        border-radius: 12px;
+        box-shadow: 0 10px 40px rgba(0, 0, 0, 0.2);
+        padding: 40px;
+        max-width: 500px;
+        width: 100%;
+      }
+
+      h1 {
+        color: #333;
+        margin-bottom: 10px;
+        font-size: 28px;
+      }
+
+      .subtitle {
+        color: #666;
+        margin-bottom: 30px;
+        font-size: 14px;
+      }
+
+      .form-group {
+        margin-bottom: 20px;
+      }
+
+      label {
+        display: block;
+        margin-bottom: 8px;
+        color: #333;
+        font-weight: 600;
+        font-size: 14px;
+      }
+
+      input,
+      select {
+        width: 100%;
+        padding: 12px;
+        border: 1px solid #ddd;
+        border-radius: 6px;
+        font-size: 14px;
+        transition: border-color 0.2s;
+      }
+
+      input:focus,
+      select:focus {
+        outline: none;
+        border-color: #667eea;
+      }
+
+      .button {
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+        color: white;
+        border: none;
+        padding: 12px 24px;
+        border-radius: 6px;
+        font-size: 16px;
+        font-weight: 600;
+        cursor: pointer;
+        transition:
+          transform 0.2s,
+          box-shadow 0.2s;
+        width: 100%;
+        margin-top: 10px;
+      }
+
+      .button:hover {
+        transform: translateY(-2px);
+        box-shadow: 0 4px 12px rgba(102, 126, 234, 0.4);
+      }
+
+      .button:active {
+        transform: translateY(0);
+      }
+
+      .button:disabled {
+        opacity: 0.6;
+        cursor: not-allowed;
+        transform: none;
+      }
+
+      .button.secondary {
+        background: #6c757d;
+        margin-top: 10px;
+      }
+
+      .button.secondary:hover {
+        box-shadow: 0 4px 12px rgba(108, 117, 125, 0.4);
+      }
+
+      .message {
+        padding: 12px;
+        border-radius: 6px;
+        margin-bottom: 20px;
+        display: none;
+      }
+
+      .message.show {
+        display: block;
+      }
+
+      .message.error {
+        background: #ffebee;
+        border-left: 4px solid #f44336;
+        color: #c62828;
+      }
+
+      .message.success {
+        background: #e8f5e9;
+        border-left: 4px solid #4caf50;
+        color: #2e7d32;
+      }
+
+      .help-text {
+        font-size: 12px;
+        color: #666;
+        margin-top: 4px;
+      }
+
+      .loading {
+        text-align: center;
+        padding: 20px;
+        color: #666;
+      }
+
+      .section-title {
+        color: #666;
+        font-size: 13px;
+        font-weight: 600;
+        text-transform: uppercase;
+        letter-spacing: 0.5px;
+        margin: 25px 0 15px 0;
+        padding-top: 15px;
+        border-top: 1px solid #eee;
+      }
+
+      .section-title:first-of-type {
+        border-top: none;
+        margin-top: 0;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="container">
+      <h1 id="pageTitle">🧷 Log Diaper Change</h1>
+      <p class="subtitle">Record a diaper change</p>
+
+      <div id="message" class="message"></div>
+
+      <form id="diaperForm">
+        <div class="form-group">
+          <label for="childSelect">Child *</label>
+          <select id="childSelect" required>
+            <option value="">Select a child</option>
+          </select>
+        </div>
+
+        <div class="form-group">
+          <label for="changeTime">Change Time *</label>
+          <input type="datetime-local" id="changeTime" required />
+        </div>
+
+        <div class="section-title">💩 Poop Information (Optional)</div>
+
+        <div class="form-group">
+          <label for="poopAmount">Poop Amount</label>
+          <select id="poopAmount">
+            <option value="">None</option>
+            <option value="light">Light</option>
+            <option value="medium">Medium</option>
+            <option value="heavy">Heavy</option>
+          </select>
+        </div>
+
+        <div class="form-group">
+          <label for="poopColor">Poop Color</label>
+          <select id="poopColor">
+            <option value="">None</option>
+            <option value="black">Black</option>
+            <option value="yellow">Yellow</option>
+            <option value="green">Green</option>
+            <option value="brown">Brown</option>
+          </select>
+        </div>
+
+        <div class="section-title">💧 Pee Information (Optional)</div>
+
+        <div class="form-group">
+          <label for="peeAmount">Pee Amount</label>
+          <select id="peeAmount">
+            <option value="">None</option>
+            <option value="light">Light</option>
+            <option value="medium">Medium</option>
+            <option value="heavy">Heavy</option>
+          </select>
+        </div>
+
+        <div class="form-group">
+          <label for="peeColor">Pee Color</label>
+          <select id="peeColor">
+            <option value="">None</option>
+            <option value="clear">Clear</option>
+            <option value="yellow">Yellow</option>
+            <option value="red">Red</option>
+          </select>
+        </div>
+
+        <button type="submit" class="button" id="submitBtn">
+          Log Diaper Change
+        </button>
+        <button type="button" class="button secondary" onclick="window.location.href='/'">
+          Cancel
+        </button>
+      </form>
+    </div>
+
+    <script>
+      // Check if user is authenticated
+      const token = localStorage.getItem("access_token");
+      if (!token) {
+        window.location.href = "/login.html";
+      }
+
+      // Check if we're in edit mode
+      const urlParams = new URLSearchParams(window.location.search);
+      const diaperChangeId = urlParams.get("id");
+      const isEditMode = !!diaperChangeId;
+
+      // Update UI for edit mode
+      if (isEditMode) {
+        document.getElementById("pageTitle").textContent = "🧷 Edit Diaper Change";
+        document.getElementById("submitBtn").textContent = "Update Diaper Change";
+      }
+
+      let children = [];
+
+      // Load children when page loads
+      async function loadChildren() {
+        try {
+          const response = await fetch("/api/children", {
+            headers: {
+              Authorization: `Bearer ${token}`,
+            },
+          });
+
+          if (response.ok) {
+            children = await response.json();
+            const select = document.getElementById("childSelect");
+
+            children.forEach((child) => {
+              const option = document.createElement("option");
+              option.value = child.id;
+              option.textContent = child.name;
+              select.appendChild(option);
+            });
+
+            // If editing, load the diaper change data
+            if (isEditMode) {
+              await loadDiaperChangeData();
+            } else {
+              // Set default time to now for new entries
+              const now = new Date();
+              now.setMinutes(now.getMinutes() - now.getTimezoneOffset());
+              document.getElementById("changeTime").value = now
+                .toISOString()
+                .slice(0, 16);
+
+              // Load last used child from localStorage
+              const lastDiaperChange = JSON.parse(
+                localStorage.getItem("lastDiaperChange") || "{}"
+              );
+
+              if (lastDiaperChange.child_id) {
+                document.getElementById("childSelect").value =
+                  lastDiaperChange.child_id;
+              }
+            }
+          } else {
+            showMessage("Failed to load children", "error");
+          }
+        } catch (error) {
+          console.error("Error:", error);
+          showMessage("Network error. Please try again.", "error");
+        }
+      }
+
+      // Load diaper change data for editing
+      async function loadDiaperChangeData() {
+        try {
+          const response = await fetch(`/api/diaper-changes/${diaperChangeId}`, {
+            headers: {
+              Authorization: `Bearer ${token}`,
+            },
+          });
+
+          if (response.ok) {
+            const diaperChange = await response.json();
+
+            // Populate form fields
+            document.getElementById("childSelect").value = diaperChange.child_id;
+
+            // Convert UTC time to local datetime-local format
+            const changeTime = new Date(diaperChange.change_time);
+            changeTime.setMinutes(
+              changeTime.getMinutes() - changeTime.getTimezoneOffset()
+            );
+            document.getElementById("changeTime").value = changeTime
+              .toISOString()
+              .slice(0, 16);
+
+            document.getElementById("poopAmount").value =
+              diaperChange.poop_amount || "";
+            document.getElementById("poopColor").value =
+              diaperChange.poop_color || "";
+            document.getElementById("peeAmount").value =
+              diaperChange.pee_amount || "";
+            document.getElementById("peeColor").value =
+              diaperChange.pee_color || "";
+          } else {
+            showMessage("Failed to load diaper change data", "error");
+          }
+        } catch (error) {
+          console.error("Error:", error);
+          showMessage("Network error. Please try again.", "error");
+        }
+      }
+
+      // Handle form submission
+      document
+        .getElementById("diaperForm")
+        .addEventListener("submit", async (e) => {
+          e.preventDefault();
+
+          const childId = parseInt(document.getElementById("childSelect").value);
+          const changeTime = new Date(
+            document.getElementById("changeTime").value
+          ).toISOString();
+          const poopAmount = document.getElementById("poopAmount").value || null;
+          const poopColor = document.getElementById("poopColor").value || null;
+          const peeAmount = document.getElementById("peeAmount").value || null;
+          const peeColor = document.getElementById("peeColor").value || null;
+
+          const submitBtn = document.getElementById("submitBtn");
+          submitBtn.disabled = true;
+          submitBtn.textContent = isEditMode ? "Updating..." : "Logging...";
+
+          try {
+            const url = isEditMode
+              ? `/api/diaper-changes/${diaperChangeId}`
+              : "/api/diaper-changes";
+            const method = isEditMode ? "PUT" : "POST";
+
+            const body = isEditMode
+              ? {
+                  change_time: changeTime,
+                  poop_amount: poopAmount,
+                  poop_color: poopColor,
+                  pee_amount: peeAmount,
+                  pee_color: peeColor,
+                }
+              : {
+                  child_id: childId,
+                  change_time: changeTime,
+                  poop_amount: poopAmount,
+                  poop_color: poopColor,
+                  pee_amount: peeAmount,
+                  pee_color: peeColor,
+                };
+
+            const response = await fetch(url, {
+              method: method,
+              headers: {
+                "Content-Type": "application/json",
+                Authorization: `Bearer ${token}`,
+              },
+              body: JSON.stringify(body),
+            });
+
+            if (response.ok) {
+              // Save last used child for next time (only for new entries, not edits)
+              if (!isEditMode) {
+                localStorage.setItem(
+                  "lastDiaperChange",
+                  JSON.stringify({
+                    child_id: childId,
+                  })
+                );
+              }
+
+              showMessage(
+                isEditMode
+                  ? "Diaper change updated successfully!"
+                  : "Diaper change logged successfully!",
+                "success"
+              );
+              setTimeout(() => {
+                window.location.href = "/";
+              }, 1000);
+            } else {
+              const errorData = await response.json();
+              showMessage(
+                errorData.detail || "Failed to log diaper change",
+                "error"
+              );
+              submitBtn.disabled = false;
+              submitBtn.textContent = isEditMode
+                ? "Update Diaper Change"
+                : "Log Diaper Change";
+            }
+          } catch (error) {
+            console.error("Error:", error);
+            showMessage("Network error. Please try again.", "error");
+            submitBtn.disabled = false;
+            submitBtn.textContent = isEditMode
+              ? "Update Diaper Change"
+              : "Log Diaper Change";
+          }
+        });
+
+      function showMessage(text, type) {
+        const messageDiv = document.getElementById("message");
+        messageDiv.textContent = text;
+        messageDiv.className = `message ${type} show`;
+      }
+
+      // Initialize
+      loadChildren();
+    </script>
+  </body>
+</html>

src/baby_monitor/static/log-feeding.html

@@ -0,0 +1,391 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Log Feeding - Baby Monitor</title>
+    <style>
+      * {
+        margin: 0;
+        padding: 0;
+        box-sizing: border-box;
+      }
+
+      body {
+        font-family:
+          -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
+          Cantarell, sans-serif;
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+        min-height: 100vh;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+        padding: 20px;
+      }
+
+      .container {
+        background: white;
+        border-radius: 12px;
+        box-shadow: 0 10px 40px rgba(0, 0, 0, 0.2);
+        padding: 40px;
+        max-width: 500px;
+        width: 100%;
+      }
+
+      h1 {
+        color: #333;
+        margin-bottom: 10px;
+        font-size: 28px;
+      }
+
+      .subtitle {
+        color: #666;
+        margin-bottom: 30px;
+        font-size: 14px;
+      }
+
+      .form-group {
+        margin-bottom: 20px;
+      }
+
+      label {
+        display: block;
+        margin-bottom: 8px;
+        color: #333;
+        font-weight: 600;
+        font-size: 14px;
+      }
+
+      input,
+      select {
+        width: 100%;
+        padding: 12px;
+        border: 1px solid #ddd;
+        border-radius: 6px;
+        font-size: 14px;
+        transition: border-color 0.2s;
+      }
+
+      input:focus,
+      select:focus {
+        outline: none;
+        border-color: #667eea;
+      }
+
+      .button {
+        background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
+        color: white;
+        border: none;
+        padding: 12px 24px;
+        border-radius: 6px;
+        font-size: 16px;
+        font-weight: 600;
+        cursor: pointer;
+        transition:
+          transform 0.2s,
+          box-shadow 0.2s;
+        width: 100%;
+        margin-top: 10px;
+      }
+
+      .button:hover {
+        transform: translateY(-2px);
+        box-shadow: 0 4px 12px rgba(102, 126, 234, 0.4);
+      }
+
+      .button:active {
+        transform: translateY(0);
+      }
+
+      .button:disabled {
+        opacity: 0.6;
+        cursor: not-allowed;
+        transform: none;
+      }
+
+      .button.secondary {
+        background: #6c757d;
+        margin-top: 10px;
+      }
+
+      .button.secondary:hover {
+        box-shadow: 0 4px 12px rgba(108, 117, 125, 0.4);
+      }
+
+      .message {
+        padding: 12px;
+        border-radius: 6px;
+        margin-bottom: 20px;
+        display: none;
+      }
+
+      .message.show {
+        display: block;
+      }
+
+      .message.error {
+        background: #ffebee;
+        border-left: 4px solid #f44336;
+        color: #c62828;
+      }
+
+      .message.success {
+        background: #e8f5e9;
+        border-left: 4px solid #4caf50;
+        color: #2e7d32;
+      }
+
+      .help-text {
+        font-size: 12px;
+        color: #666;
+        margin-top: 4px;
+      }
+
+      .loading {
+        text-align: center;
+        padding: 20px;
+        color: #666;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="container">
+      <h1>🍼 Log Feeding</h1>
+      <p class="subtitle">Record a feeding session</p>
+
+      <div id="message" class="message"></div>
+
+      <div id="loadingChildren" class="loading">Loading children...</div>
+
+      <form id="logFeedingForm" style="display: none">
+        <div class="form-group">
+          <label for="childId">Child *</label>
+          <select id="childId" name="childId" required>
+            <option value="">Select a child</option>
+          </select>
+        </div>
+
+        <div class="form-group">
+          <label for="startTime">Start Time *</label>
+          <input
+            type="datetime-local"
+            id="startTime"
+            name="startTime"
+            required
+          />
+          <p class="help-text">Defaults to current time</p>
+        </div>
+
+        <div class="form-group">
+          <label for="endTime">End Time</label>
+          <input type="datetime-local" id="endTime" name="endTime" />
+          <p class="help-text">Leave empty if feeding is ongoing</p>
+        </div>
+
+        <div class="form-group">
+          <label for="feedingType">Feeding Type *</label>
+          <select id="feedingType" name="feedingType" required>
+            <option value="">Select type</option>
+            <option value="left_breast">Left Breast</option>
+            <option value="right_breast">Right Breast</option>
+            <option value="bottle">Bottle</option>
+          </select>
+        </div>
+
+        <button type="submit" class="button" id="submitBtn">Log Feeding</button>
+        <button type="button" class="button secondary" onclick="goBack()">
+          Cancel
+        </button>
+      </form>
+    </div>
+
+    <script>
+      // Check if user is authenticated
+      const token = localStorage.getItem("access_token");
+      if (!token) {
+        window.location.href = "/login.html";
+      }
+
+      const form = document.getElementById("logFeedingForm");
+      const messageDiv = document.getElementById("message");
+      const submitBtn = document.getElementById("submitBtn");
+      const loadingDiv = document.getElementById("loadingChildren");
+      const childSelect = document.getElementById("childId");
+
+      // Check if we're editing an existing feeding
+      const urlParams = new URLSearchParams(window.location.search);
+      const feedingId = urlParams.get("id");
+      const isEditMode = !!feedingId;
+
+      // Set default start time to now (only for new feedings)
+      if (!isEditMode) {
+        const now = new Date();
+        const localDateTime = new Date(
+          now.getTime() - now.getTimezoneOffset() * 60000,
+        )
+          .toISOString()
+          .slice(0, 16);
+        document.getElementById("startTime").value = localDateTime;
+      }
+
+      // Update title and button text if editing
+      if (isEditMode) {
+        document.querySelector("h1").textContent = "🍼 Edit Feeding";
+        document.querySelector(".subtitle").textContent = "Update feeding session details";
+        submitBtn.textContent = "Update Feeding";
+      }
+
+      // Load user's children
+      async function loadChildren() {
+        try {
+          const response = await fetch("/api/children", {
+            headers: {
+              Authorization: `Bearer ${token}`,
+            },
+          });
+
+          if (response.ok) {
+            const children = await response.json();
+
+            if (children.length === 0) {
+              showMessage(
+                "No children found. Please add a child first.",
+                "error",
+              );
+              setTimeout(() => {
+                window.location.href = "/add-child.html";
+              }, 2000);
+              return;
+            }
+
+            // Populate select dropdown
+            children.forEach((child) => {
+              const option = document.createElement("option");
+              option.value = child.id;
+              option.textContent = child.name;
+              childSelect.appendChild(option);
+            });
+
+            // Show form, hide loading
+            loadingDiv.style.display = "none";
+            form.style.display = "block";
+
+            // If editing, load the feeding data
+            if (isEditMode) {
+              loadFeedingData();
+            }
+          } else {
+            showMessage("Failed to load children", "error");
+          }
+        } catch (error) {
+          showMessage("Network error loading children", "error");
+        }
+      }
+
+      async function loadFeedingData() {
+        try {
+          const response = await fetch(`/api/feedings/${feedingId}`, {
+            headers: {
+              Authorization: `Bearer ${token}`,
+            },
+          });
+
+          if (response.ok) {
+            const feeding = await response.json();
+            
+            // Populate form with existing data
+            document.getElementById("childId").value = feeding.child_id;
+            
+            // Format datetime for datetime-local input
+            const startTime = new Date(feeding.start_time);
+            const startLocalDateTime = new Date(
+              startTime.getTime() - startTime.getTimezoneOffset() * 60000
+            ).toISOString().slice(0, 16);
+            document.getElementById("startTime").value = startLocalDateTime;
+            
+            if (feeding.end_time) {
+              const endTime = new Date(feeding.end_time);
+              const endLocalDateTime = new Date(
+                endTime.getTime() - endTime.getTimezoneOffset() * 60000
+              ).toISOString().slice(0, 16);
+              document.getElementById("endTime").value = endLocalDateTime;
+            }
+            
+            document.getElementById("feedingType").value = feeding.feeding_type;
+          } else {
+            showMessage("Failed to load feeding data", "error");
+          }
+        } catch (error) {
+          showMessage("Network error loading feeding", "error");
+        }
+      }
+
+      loadChildren();
+
+      form.addEventListener("submit", async (e) => {
+        e.preventDefault();
+
+        const childId = parseInt(document.getElementById("childId").value);
+        const startTime = document.getElementById("startTime").value;
+        const endTimeValue = document.getElementById("endTime").value;
+        const feedingType = document.getElementById("feedingType").value;
+
+        // Disable button during request
+        submitBtn.disabled = true;
+        submitBtn.textContent = isEditMode ? "Updating..." : "Logging...";
+        messageDiv.classList.remove("show");
+
+        try {
+          const url = isEditMode ? `/api/feedings/${feedingId}` : "/api/feedings";
+          const method = isEditMode ? "PUT" : "POST";
+          
+          const response = await fetch(url, {
+            method: method,
+            headers: {
+              "Content-Type": "application/json",
+              Authorization: `Bearer ${token}`,
+            },
+            body: JSON.stringify({
+              child_id: childId,
+              start_time: startTime,
+              end_time: endTimeValue || null,
+              feeding_type: feedingType,
+            }),
+          });
+
+          const data = await response.json();
+
+          if (response.ok) {
+            showMessage(
+              isEditMode ? "Feeding updated successfully!" : "Feeding logged successfully!", 
+              "success"
+            );
+            // Redirect to feedings page after 1 second
+            setTimeout(() => {
+              window.location.href = "/feedings.html";
+            }, 1000);
+          } else {
+            showMessage(
+              data.detail || `Failed to ${isEditMode ? 'update' : 'log'} feeding. Please try again.`,
+              "error",
+            );
+          }
+        } catch (error) {
+          showMessage("Network error. Please try again.", "error");
+        } finally {
+          submitBtn.disabled = false;
+          submitBtn.textContent = isEditMode ? "Update Feeding" : "Log Feeding";
+        }
+      });
+
+      function showMessage(text, type) {
+        messageDiv.textContent = text;
+        messageDiv.className = `message ${type} show`;
+      }
+
+      function goBack() {
+        window.location.href = "/";
+      }
+    </script>
+  </body>
+</html>

tests/conftest.py

@@ -12,3 +12,9 @@ def pytest_configure(config: pytest.Config) -> None:
         tmpdir = tempfile.mkdtemp(prefix="baby_monitor_test_")
         os.environ["DATA_DIR"] = tmpdir
         os.environ["ENVIRONMENT"] = "development"
+
+    # Set admin credentials for tests
+    if "ADMIN_USERNAME" not in os.environ:
+        os.environ["ADMIN_USERNAME"] = "admin"
+    if "ADMIN_PASSWORD" not in os.environ:
+        os.environ["ADMIN_PASSWORD"] = "password"