13 Commits
Author SHA1 Message Date
brian 143c3a0323 Merge pull request 'added settings page' (#21) from add-user-settings-page into main
Python Code Quality / python-code-quality (push) Successful in 9s
Python Test / python-test (push) Successful in 18s
Build and Push Docker Image / build-and-push (push) Successful in 25s
Reviewed-on: #21
2025-11-11 01:01:04 +01:00
Brian Bjarke Jensen d066c6d399 added settings page with ability to update password, delete user and CRUD and share abilities for associated children
Build and Push Docker Image / build-and-push (pull_request) Successful in 58s
Python Code Quality / python-code-quality (pull_request) Successful in 10s
Python Test / python-test (pull_request) Successful in 18s
2025-11-11 00:58:55 +01:00
brian 0d27c47f39 Merge pull request 'updated admin page with more functionality, simplified burger menu and added many-to-many parent-child relationship' (#20) from expand-admin-page into main
Build and Push Docker Image / build-and-push (push) Successful in 25s
Python Code Quality / python-code-quality (push) Successful in 9s
Python Test / python-test (push) Successful in 17s
Reviewed-on: #20
2025-11-10 23:01:33 +01:00
Brian Bjarke Jensen 402b5898bb updated admin page with more functionality, simplified burger menu and added many-to-many parent-child relationship
Build and Push Docker Image / build-and-push (pull_request) Successful in 59s
Python Code Quality / python-code-quality (pull_request) Successful in 10s
Python Test / python-test (pull_request) Successful in 17s
2025-11-10 22:58:52 +01:00
brian df28af880a Merge pull request 'added sleep logging workflow and overview page' (#17) from support-logging-sleep into main
Python Code Quality / python-code-quality (push) Successful in 10s
Python Test / python-test (push) Successful in 18s
Build and Push Docker Image / build-and-push (push) Successful in 26s
Reviewed-on: #17
2025-11-10 21:20:55 +01:00
Brian Bjarke Jensen 6c3d301027 formatting fixes
Build and Push Docker Image / build-and-push (pull_request) Successful in 58s
Python Code Quality / python-code-quality (pull_request) Successful in 10s
Python Test / python-test (pull_request) Successful in 18s
2025-11-10 21:19:13 +01:00
Brian Bjarke Jensen cd3db4fb86 added sleep logging workflow and overview page
Build and Push Docker Image / build-and-push (pull_request) Successful in 58s
Python Code Quality / python-code-quality (pull_request) Failing after 10s
Python Test / python-test (pull_request) Successful in 17s
2025-11-10 21:00:03 +01:00
brian edeb01c889 Merge pull request 'added diaper overview page' (#16) from add-diaper-change-overview into main
Python Code Quality / python-code-quality (push) Successful in 9s
Python Test / python-test (push) Successful in 17s
Build and Push Docker Image / build-and-push (push) Successful in 25s
Reviewed-on: #16
2025-11-10 16:26:43 +01:00
Brian Bjarke Jensen cf3029b545 added diaper overview page
Build and Push Docker Image / build-and-push (pull_request) Successful in 57s
Python Code Quality / python-code-quality (pull_request) Successful in 10s
Python Test / python-test (pull_request) Successful in 17s
2025-11-10 16:24:07 +01:00
brian aaa84b8b1a Merge pull request 'support-add-diaper-entry' (#13) from support-add-diaper-entry into main
Python Test / python-test (push) Successful in 17s
Build and Push Docker Image / build-and-push (push) Successful in 30s
Python Code Quality / python-code-quality (push) Successful in 9s
Reviewed-on: #13
2025-11-10 15:59:45 +01:00
Brian Bjarke Jensen e9e5936267 removed unused text
Build and Push Docker Image / build-and-push (pull_request) Successful in 1m6s
Python Code Quality / python-code-quality (pull_request) Successful in 10s
Python Test / python-test (pull_request) Successful in 17s
2025-11-10 15:56:57 +01:00
Brian Bjarke Jensen 788b473c23 added functionality to log diaper changes 2025-11-10 15:56:08 +01:00
Brian Bjarke Jensen 0853ff0ff4 corrected postgres uri 2025-11-10 15:55:26 +01:00
47 changed files with 5674 additions and 346 deletions
+1 -1
View File
@@ -17,7 +17,7 @@ services:
# Use Redis for token storage
- REDIS_URI=redis://redis:6379/0
# Use PostgreSQL for database
- DATABASE_URL=postgresql://baby_monitor:securepassword@postgres:5432/b
- DATABASE_URL=postgresql://baby_monitor:securepassword@postgres:5432/baby_monitor_db
command: ["--host", "0.0.0.0", "--port", "8000"]
restart: unless-stopped
depends_on:
+40
View File
@@ -14,6 +14,8 @@ 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.sleep import router as sleep_router
from baby_monitor.routers.health import router as health_router
from baby_monitor.repositories.dependencies.get_database import init_db
@@ -51,6 +53,8 @@ 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(sleep_router)
app.include_router(health_router)
@@ -97,6 +101,42 @@ def serve_feedings() -> FileResponse:
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("/sleep.html", include_in_schema=False)
def serve_sleep() -> FileResponse:
"""Serve the sleep overview page."""
return FileResponse(static_path / "sleep.html")
@app.get("/settings.html", include_in_schema=False)
def serve_settings() -> FileResponse:
"""Serve the settings page."""
return FileResponse(static_path / "settings.html")
@app.get("/menu.css", include_in_schema=False)
def serve_menu_css() -> FileResponse:
"""Serve the shared menu CSS."""
return FileResponse(static_path / "menu.css")
@app.get("/menu.js", include_in_schema=False)
def serve_menu_js() -> FileResponse:
"""Serve the shared menu JavaScript."""
return FileResponse(static_path / "menu.js")
@app.get("/api/")
def read_root(token: Annotated[str, Depends(verify_token)]) -> dict:
"""API root endpoint (requires authentication)."""
-1
View File
@@ -19,5 +19,4 @@ class ChildResponse(BaseModel):
name: str
birth_time: datetime
birth_weight: float
user_id: int
created_at: datetime
@@ -0,0 +1,41 @@
"""Child invitation model for sharing child access."""
from datetime import datetime
from typing import TYPE_CHECKING
from sqlalchemy import Boolean, DateTime, Integer, String, ForeignKey
from sqlalchemy.orm import Mapped, mapped_column
if TYPE_CHECKING:
from sqlalchemy.orm import DeclarativeBase
Base = DeclarativeBase
else:
from baby_monitor.repositories.dependencies.get_database import Base
class ChildInvitation(Base):
"""Invitation code for sharing child access with other users."""
__tablename__ = "child_invitations"
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
code: Mapped[str] = mapped_column(String, unique=True, nullable=False)
child_id: Mapped[int] = mapped_column(
Integer, ForeignKey("children.id"), nullable=False
)
created_by_user_id: Mapped[int] = mapped_column(
Integer, ForeignKey("users.id"), nullable=False
)
created_at: Mapped[datetime] = mapped_column(
DateTime(timezone=True), nullable=False
)
expires_at: Mapped[datetime] = mapped_column(
DateTime(timezone=True), nullable=False
)
is_consumed: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
consumed_by_user_id: Mapped[int | None] = mapped_column(
Integer, ForeignKey("users.id"), nullable=True
)
consumed_at: Mapped[datetime | None] = mapped_column(
DateTime(timezone=True), nullable=True
)
+2 -3
View File
@@ -1,7 +1,7 @@
"""Child database model."""
from typing import TYPE_CHECKING
from sqlalchemy import Column, Integer, String, DateTime, Float, ForeignKey
from sqlalchemy import Column, Integer, String, DateTime, Float
from datetime import datetime
if TYPE_CHECKING:
@@ -21,8 +21,7 @@ class Child(Base):
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})>"
return f"<Child(id={self.id}, name='{self.name}')>"
@@ -0,0 +1,29 @@
"""Child-Parent junction table for many-to-many relationship."""
from typing import TYPE_CHECKING
from sqlalchemy import Column, Integer, ForeignKey, DateTime
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 ChildParent(Base):
"""Junction table linking children to their parents (users)."""
__tablename__ = "child_parents"
id = Column(Integer, primary_key=True, index=True)
child_id = Column(Integer, ForeignKey("children.id"), nullable=False)
user_id = Column(Integer, ForeignKey("users.id"), nullable=False)
created_at = Column(DateTime, default=datetime.utcnow, nullable=False)
def __repr__(self) -> str:
return (
f"<ChildParent(id={self.id}, "
f"child_id={self.child_id}, user_id={self.user_id})>"
)
@@ -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})>"
+27
View File
@@ -0,0 +1,27 @@
"""Sleep database model."""
from typing import TYPE_CHECKING
from sqlalchemy import Column, Integer, DateTime, ForeignKey
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 Sleep(Base):
"""Sleep log database model."""
__tablename__ = "sleep_logs"
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)
created_at = Column(DateTime, default=datetime.now(UTC), nullable=False)
def __repr__(self) -> str:
return f"<Sleep(id={self.id}, child_id={self.child_id})>"
+46
View File
@@ -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
+33
View File
@@ -9,3 +9,36 @@ class FeedingType(StrEnum):
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"
+28
View File
@@ -0,0 +1,28 @@
"""Sleep-related request and response models."""
from datetime import datetime
from pydantic import BaseModel, Field
class CreateSleepRequest(BaseModel):
"""Request model for creating a sleep log."""
child_id: int = Field(..., gt=0)
start_time: datetime
class UpdateSleepRequest(BaseModel):
"""Request model for updating a sleep log."""
end_time: datetime | None = None
class SleepResponse(BaseModel):
"""Response model for sleep log data."""
id: int
child_id: int
start_time: datetime
end_time: datetime | None
created_at: datetime
child_name: str | None = None # Optional, populated when needed
+10
View File
@@ -1,13 +1,23 @@
"""Repository implementations package."""
from baby_monitor.repositories.dependencies import (
get_child_repository,
get_credentials_repository,
get_diaper_change_repository,
get_feeding_repository,
get_invitation_repository,
get_sleep_repository,
get_token_repository,
get_user_repository,
)
__all__ = [
"get_child_repository",
"get_credentials_repository",
"get_diaper_change_repository",
"get_feeding_repository",
"get_invitation_repository",
"get_sleep_repository",
"get_token_repository",
"get_user_repository",
]
@@ -1,12 +1,13 @@
"""SQLite implementation of child repository."""
from datetime import datetime
from datetime import datetime, UTC
from sqlalchemy.orm import Session
from baby_monitor.repositories.interfaces.child_repository_interface import (
ChildRepositoryInterface,
)
from baby_monitor.models.db.child import Child
from baby_monitor.models.db.child_parent import ChildParent
class SQLiteChildRepository(ChildRepositoryInterface):
@@ -18,23 +19,29 @@ class SQLiteChildRepository(ChildRepositoryInterface):
def create(
self, name: str, birth_time: datetime, birth_weight: float, user_id: int
) -> dict:
"""Create a new child record."""
"""Create a new child record and link to user."""
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)
# Create the child-parent relationship
child_parent = ChildParent(
child_id=child.id,
user_id=user_id,
)
self.db.add(child_parent)
self.db.commit()
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,
}
@@ -49,13 +56,18 @@ class SQLiteChildRepository(ChildRepositoryInterface):
"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()
"""Get all children for a specific user via junction table."""
# Join Child and ChildParent tables
children = (
self.db.query(Child)
.join(ChildParent, Child.id == ChildParent.child_id)
.filter(ChildParent.user_id == user_id)
.all()
)
return [
{
@@ -63,12 +75,59 @@ class SQLiteChildRepository(ChildRepositoryInterface):
"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 get_parent_ids(self, child_id: int) -> list[int]:
"""Get all parent user IDs for a specific child."""
parent_ids = (
self.db.query(ChildParent.user_id)
.filter(ChildParent.child_id == child_id)
.all()
)
return [user_id for (user_id,) in parent_ids]
def remove_parent(self, child_id: int, user_id: int) -> bool:
"""Remove a parent-child relationship."""
link = (
self.db.query(ChildParent)
.filter(
ChildParent.child_id == child_id,
ChildParent.user_id == user_id,
)
.first()
)
if link:
self.db.delete(link)
self.db.commit()
return True
return False
def add_parent(self, child_id: int, user_id: int) -> bool:
"""Add a parent-child relationship."""
# Check if relationship already exists
existing = (
self.db.query(ChildParent)
.filter(
ChildParent.child_id == child_id,
ChildParent.user_id == user_id,
)
.first()
)
if existing:
return False
link = ChildParent(
child_id=child_id,
user_id=user_id,
created_at=datetime.now(UTC),
)
self.db.add(link)
self.db.commit()
return True
def update(
self,
child_id: int,
@@ -96,16 +155,19 @@ class SQLiteChildRepository(ChildRepositoryInterface):
"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."""
"""Delete a child record and all parent relationships."""
child = self.db.query(Child).filter(Child.id == child_id).first()
if not child:
return False
# Delete all parent relationships first
self.db.query(ChildParent).filter(ChildParent.child_id == child_id).delete()
# Delete the child
self.db.delete(child)
self.db.commit()
return True
@@ -0,0 +1,7 @@
"""Child invitation repository implementations."""
from baby_monitor.repositories.child_invitation.sqlite_child_invitation import ( # noqa: E501
SQLiteChildInvitationRepository,
)
__all__ = ["SQLiteChildInvitationRepository"]
@@ -0,0 +1,93 @@
"""SQLite implementation of child invitation repository."""
from datetime import datetime, UTC
from sqlalchemy.orm import Session
from baby_monitor.models.child_invitation import ChildInvitation
from baby_monitor.repositories.interfaces.child_invitation import (
ChildInvitationRepositoryInterface,
)
class SQLiteChildInvitationRepository(ChildInvitationRepositoryInterface):
"""SQLite implementation of child invitation repository."""
def __init__(self, db: Session):
"""Initialize the repository with a database session."""
self.db = db
def create_invitation(
self,
code: str,
child_id: int,
created_by_user_id: int,
expires_at: datetime,
) -> int:
"""Create a new child invitation."""
invitation = ChildInvitation(
code=code,
child_id=child_id,
created_by_user_id=created_by_user_id,
created_at=datetime.now(UTC),
expires_at=expires_at,
is_consumed=False,
)
self.db.add(invitation)
self.db.commit()
self.db.refresh(invitation)
return invitation.id
def get_by_code(self, code: str) -> dict | None:
"""Get invitation by code."""
invitation = (
self.db.query(ChildInvitation).filter(ChildInvitation.code == code).first()
)
if not invitation:
return None
return {
"id": invitation.id,
"code": invitation.code,
"child_id": invitation.child_id,
"created_by_user_id": invitation.created_by_user_id,
"created_at": invitation.created_at,
"expires_at": invitation.expires_at,
"is_consumed": invitation.is_consumed,
"consumed_by_user_id": invitation.consumed_by_user_id,
"consumed_at": invitation.consumed_at,
}
def verify_invitation(self, code: str) -> bool:
"""Verify if an invitation code is valid and not expired."""
invitation = (
self.db.query(ChildInvitation).filter(ChildInvitation.code == code).first()
)
if not invitation:
return False
if invitation.is_consumed:
return False
# Compare as naive UTC datetimes (SQLite stores without timezone)
now_utc = datetime.now(UTC).replace(tzinfo=None)
if invitation.expires_at < now_utc:
return False
return True
def consume_invitation(
self, code: str, consumed_by_user_id: int, consumed_at: datetime
) -> bool:
"""Mark invitation as consumed."""
invitation = (
self.db.query(ChildInvitation).filter(ChildInvitation.code == code).first()
)
if not invitation:
return False
invitation.is_consumed = True
invitation.consumed_by_user_id = consumed_by_user_id
invitation.consumed_at = consumed_at
self.db.commit()
return True
@@ -1,11 +1,23 @@
"""Dependency injection for repositories."""
from .get_child_invitation_repository import get_child_invitation_repository
from .get_child_repository import get_child_repository
from .get_credentials_repository import get_credentials_repository
from .get_diaper_change_repository import get_diaper_change_repository
from .get_feeding_repository import get_feeding_repository
from .get_invitation_repository import get_invitation_repository
from .get_sleep_repository import get_sleep_repository
from .get_token_repository import get_token_repository
from .get_user_repository import get_user_repository
__all__ = [
"get_user_repository",
"get_token_repository",
"get_child_invitation_repository",
"get_child_repository",
"get_credentials_repository",
"get_diaper_change_repository",
"get_feeding_repository",
"get_invitation_repository",
"get_sleep_repository",
"get_token_repository",
"get_user_repository",
]
@@ -0,0 +1,16 @@
"""Dependency for child invitation repository."""
from typing import Annotated
from fastapi import Depends
from sqlalchemy.orm import Session
from baby_monitor.repositories.child_invitation.sqlite_child_invitation import ( # noqa: E501
SQLiteChildInvitationRepository,
)
from baby_monitor.repositories.dependencies.get_database import get_database
def get_child_invitation_repository(
db: Annotated[Session, Depends(get_database)],
) -> SQLiteChildInvitationRepository:
"""Get child invitation repository instance."""
return SQLiteChildInvitationRepository(db)
@@ -78,8 +78,12 @@ def init_db() -> None:
# 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.child_parent import ChildParent # 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.db.sleep import Sleep # noqa: F401
from baby_monitor.models.invitation import Invitation # noqa: F401
from baby_monitor.models.child_invitation import ChildInvitation # noqa: F401
# Ensure data directory exists
DATA_DIR.mkdir(parents=True, exist_ok=True)
@@ -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)
@@ -0,0 +1,15 @@
"""Dependency for getting sleep 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.sleep.sqlite_sleep import SQLiteSleepRepository
def get_sleep_repository(
db: Annotated[Session, Depends(get_database)],
) -> SQLiteSleepRepository:
"""Get sleep repository instance."""
return SQLiteSleepRepository(db)
@@ -0,0 +1,135 @@
"""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
from baby_monitor.models.db.child_parent import ChildParent
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, DiaperChange.child_id == Child.id)
.join(ChildParent, Child.id == ChildParent.child_id)
.filter(ChildParent.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,
}
@@ -8,6 +8,7 @@ from baby_monitor.repositories.interfaces.feeding_repository_interface import (
)
from baby_monitor.models.db.feeding import Feeding
from baby_monitor.models.db.child import Child
from baby_monitor.models.db.child_parent import ChildParent
class SQLiteFeedingRepository(FeedingRepositoryInterface):
@@ -57,8 +58,9 @@ class SQLiteFeedingRepository(FeedingRepositoryInterface):
"""Get all feeding logs for a specific user's children."""
feedings = (
self.db.query(Feeding)
.join(Child)
.filter(Child.user_id == user_id)
.join(Child, Feeding.child_id == Child.id)
.join(ChildParent, Child.id == ChildParent.child_id)
.filter(ChildParent.user_id == user_id)
.order_by(Feeding.start_time.desc())
.all()
)
@@ -1,5 +1,8 @@
"""Repository interfaces package."""
from .child_invitation import (
ChildInvitationRepositoryInterface,
)
from .credentials_repository_interface import (
CredentialsRepositoryInterface,
)
@@ -12,10 +15,27 @@ from .token_repository_interface import (
from .user_repository_interface import (
UserRepositoryInterface,
)
from .child_repository_interface import (
ChildRepositoryInterface,
)
from .feeding_repository_interface import (
FeedingRepositoryInterface,
)
from .diaper_change_repository_interface import (
DiaperChangeRepositoryInterface,
)
from .sleep_repository_interface import (
SleepRepositoryInterface,
)
__all__ = [
"UserRepositoryInterface",
"TokenRepositoryInterface",
"ChildInvitationRepositoryInterface",
"ChildRepositoryInterface",
"CredentialsRepositoryInterface",
"DiaperChangeRepositoryInterface",
"FeedingRepositoryInterface",
"InvitationRepositoryInterface",
"SleepRepositoryInterface",
"TokenRepositoryInterface",
"UserRepositoryInterface",
]
@@ -0,0 +1,36 @@
"""Repository interface for child invitation operations."""
from abc import ABC, abstractmethod
from datetime import datetime
class ChildInvitationRepositoryInterface(ABC):
"""Interface for child invitation repository operations."""
@abstractmethod
def create_invitation(
self,
code: str,
child_id: int,
created_by_user_id: int,
expires_at: datetime,
) -> int:
"""Create a new child invitation."""
pass
@abstractmethod
def get_by_code(self, code: str) -> dict | None:
"""Get invitation by code."""
pass
@abstractmethod
def verify_invitation(self, code: str) -> bool:
"""Verify if an invitation code is valid and not expired."""
pass
@abstractmethod
def consume_invitation(
self, code: str, consumed_by_user_id: int, consumed_at: datetime
) -> bool:
"""Mark invitation as consumed."""
pass
@@ -34,3 +34,15 @@ class ChildRepositoryInterface(ABC):
@abstractmethod
def delete(self, child_id: int) -> bool:
"""Delete a child record."""
@abstractmethod
def get_parent_ids(self, child_id: int) -> list[int]:
"""Get all parent user IDs for a specific child."""
@abstractmethod
def remove_parent(self, child_id: int, user_id: int) -> bool:
"""Remove a parent-child relationship."""
@abstractmethod
def add_parent(self, child_id: int, user_id: int) -> bool:
"""Add a parent-child relationship."""
@@ -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."""
@@ -0,0 +1,40 @@
"""Interface for sleep repository operations."""
from abc import ABC, abstractmethod
from datetime import datetime
class SleepRepositoryInterface(ABC):
"""Interface for sleep log data access operations."""
@abstractmethod
def create(
self,
child_id: int,
start_time: datetime,
) -> dict:
"""Create a new sleep log entry."""
@abstractmethod
def get_by_id(self, sleep_id: int) -> dict | None:
"""Get a sleep log by ID."""
@abstractmethod
def get_by_child_id(self, child_id: int) -> list[dict]:
"""Get all sleep logs for a specific child."""
@abstractmethod
def get_by_user_id(self, user_id: int) -> list[dict]:
"""Get all sleep logs for a specific user's children."""
@abstractmethod
def update(
self,
sleep_id: int,
end_time: datetime | None = None,
) -> dict | None:
"""Update a sleep log entry."""
@abstractmethod
def delete(self, sleep_id: int) -> bool:
"""Delete a sleep log entry."""
@@ -17,3 +17,15 @@ class UserRepositoryInterface(ABC):
@abstractmethod
def get_by_id(self, user_id: int) -> dict | None:
"""Get user by ID."""
@abstractmethod
def get_all(self) -> list[dict]:
"""Get all users."""
@abstractmethod
def delete(self, user_id: int) -> bool:
"""Delete a user by ID. Returns True if successful."""
@abstractmethod
def update_password(self, user_id: int, hashed_password: str) -> bool:
"""Update user password. Returns True if successful."""
@@ -0,0 +1,101 @@
"""SQLite implementation of sleep repository."""
from datetime import datetime
from sqlalchemy.orm import Session
from baby_monitor.repositories.interfaces.sleep_repository_interface import (
SleepRepositoryInterface,
)
from baby_monitor.models.db.sleep import Sleep
from baby_monitor.models.db.child import Child
from baby_monitor.models.db.child_parent import ChildParent
class SQLiteSleepRepository(SleepRepositoryInterface):
"""SQLite implementation for sleep log data access."""
def __init__(self, db: Session):
self.db = db
def create(
self,
child_id: int,
start_time: datetime,
) -> dict:
"""Create a new sleep log entry."""
sleep = Sleep(
child_id=child_id,
start_time=start_time,
end_time=None,
)
self.db.add(sleep)
self.db.commit()
self.db.refresh(sleep)
return self._to_dict(sleep)
def get_by_id(self, sleep_id: int) -> dict | None:
"""Get a sleep log by ID."""
sleep = self.db.query(Sleep).filter(Sleep.id == sleep_id).first()
if not sleep:
return None
return self._to_dict(sleep)
def get_by_child_id(self, child_id: int) -> list[dict]:
"""Get all sleep logs for a specific child."""
sleeps = (
self.db.query(Sleep)
.filter(Sleep.child_id == child_id)
.order_by(Sleep.start_time.desc())
.all()
)
return [self._to_dict(sleep) for sleep in sleeps]
def get_by_user_id(self, user_id: int) -> list[dict]:
"""Get all sleep logs for a specific user's children."""
sleeps = (
self.db.query(Sleep)
.join(Child, Sleep.child_id == Child.id)
.join(ChildParent, Child.id == ChildParent.child_id)
.filter(ChildParent.user_id == user_id)
.order_by(Sleep.start_time.desc())
.all()
)
return [self._to_dict(sleep) for sleep in sleeps]
def update(
self,
sleep_id: int,
end_time: datetime | None = None,
) -> dict | None:
"""Update a sleep log entry."""
sleep = self.db.query(Sleep).filter(Sleep.id == sleep_id).first()
if not sleep:
return None
if end_time is not None:
sleep.end_time = end_time # type: ignore[assignment]
self.db.commit()
self.db.refresh(sleep)
return self._to_dict(sleep)
def delete(self, sleep_id: int) -> bool:
"""Delete a sleep log entry."""
sleep = self.db.query(Sleep).filter(Sleep.id == sleep_id).first()
if not sleep:
return False
self.db.delete(sleep)
self.db.commit()
return True
def _to_dict(self, sleep: Sleep) -> dict:
"""Convert Sleep model to dictionary."""
return {
"id": sleep.id,
"child_id": sleep.child_id,
"start_time": sleep.start_time,
"end_time": sleep.end_time,
"created_at": sleep.created_at,
}
@@ -55,3 +55,35 @@ class SQLiteUserRepository(UserRepositoryInterface):
"created_at": user.created_at,
}
return None
def get_all(self) -> list[dict]:
"""Get all users."""
users = self.db.query(User).all()
return [
{
"id": user.id,
"username": user.username,
"hashed_password": user.hashed_password,
"is_admin": user.is_admin,
"created_at": user.created_at,
}
for user in users
]
def delete(self, user_id: int) -> bool:
"""Delete a user by ID. Returns True if successful."""
user = self.db.query(User).filter(User.id == user_id).first()
if user:
self.db.delete(user)
self.db.commit()
return True
return False
def update_password(self, user_id: int, hashed_password: str) -> bool:
"""Update user password. Returns True if successful."""
user = self.db.query(User).filter(User.id == user_id).first()
if user:
user.hashed_password = hashed_password # type: ignore
self.db.commit()
return True
return False
+190 -1
View File
@@ -3,15 +3,35 @@
import secrets
from datetime import datetime, timedelta, UTC
from typing import Annotated
from fastapi import APIRouter, Depends
from fastapi import APIRouter, Depends, HTTPException
from pydantic import BaseModel
from baby_monitor.routers.auth import verify_admin
from baby_monitor.repositories.dependencies.get_invitation_repository import (
get_invitation_repository,
)
from baby_monitor.repositories.dependencies.get_user_repository import (
get_user_repository,
)
from baby_monitor.repositories.dependencies.get_child_repository import (
get_child_repository,
)
from baby_monitor.repositories.dependencies.get_feeding_repository import (
get_feeding_repository,
)
from baby_monitor.repositories.dependencies.get_diaper_change_repository import (
get_diaper_change_repository,
)
from baby_monitor.repositories.dependencies.get_sleep_repository import (
get_sleep_repository,
)
from baby_monitor.repositories.interfaces import (
InvitationRepositoryInterface,
UserRepositoryInterface,
ChildRepositoryInterface,
FeedingRepositoryInterface,
DiaperChangeRepositoryInterface,
SleepRepositoryInterface,
)
router = APIRouter(prefix="/api/admin", tags=["admin"])
@@ -64,3 +84,172 @@ async def generate_invitation_link(
expires_at=expires_at.isoformat(),
message="Invitation link generated successfully. Valid for 24 hours.",
)
class UserResponse(BaseModel):
"""Response model for user data."""
id: int
username: str
is_admin: bool
created_at: datetime
class DeleteUserResponse(BaseModel):
"""Response model for user deletion."""
message: str
deleted_children: list[int]
deleted_feedings: int
deleted_diapers: int
deleted_sleeps: int
@router.get("/users", response_model=list[UserResponse])
async def get_all_users(
admin_id: Annotated[int, Depends(verify_admin)],
user_repository: Annotated[
UserRepositoryInterface,
Depends(get_user_repository),
],
) -> list[UserResponse]:
"""Get all users in the system.
Requires admin role.
Args:
admin_id: Admin user ID (from verify_admin)
user_repository: User storage backend
Returns:
List of all users with their basic information
"""
users = user_repository.get_all()
return [
UserResponse(
id=user["id"],
username=user["username"],
is_admin=user["is_admin"],
created_at=user["created_at"],
)
for user in users
]
@router.delete("/users/{user_id}", response_model=DeleteUserResponse)
async def delete_user(
user_id: int,
admin_id: Annotated[int, Depends(verify_admin)],
user_repository: Annotated[
UserRepositoryInterface,
Depends(get_user_repository),
],
child_repository: Annotated[
ChildRepositoryInterface,
Depends(get_child_repository),
],
feeding_repository: Annotated[
FeedingRepositoryInterface,
Depends(get_feeding_repository),
],
diaper_repository: Annotated[
DiaperChangeRepositoryInterface,
Depends(get_diaper_change_repository),
],
sleep_repository: Annotated[
SleepRepositoryInterface,
Depends(get_sleep_repository),
],
) -> DeleteUserResponse:
"""Delete a user and cascade delete orphaned children and their logs.
When a user is deleted:
1. Find all children belonging to this user
2. For each child, check if other users also have this child
3. Delete only children that have no other parents (orphaned)
4. For orphaned children, delete all associated logs (feedings, diapers, sleep)
5. Finally delete the user
Requires admin role.
Args:
user_id: ID of user to delete
admin_id: Admin user ID (from verify_admin)
user_repository: User storage backend
child_repository: Child storage backend
feeding_repository: Feeding storage backend
diaper_repository: Diaper change storage backend
sleep_repository: Sleep storage backend
Returns:
DeleteUserResponse with deletion summary
Raises:
HTTPException: If user not found or trying to delete yourself
"""
# Prevent admin from deleting themselves
if user_id == admin_id:
raise HTTPException(status_code=400, detail="Cannot delete your own account")
# Check if user exists
user = user_repository.get_by_id(user_id)
if not user:
raise HTTPException(status_code=404, detail="User not found")
# Get all children belonging to this user
children = child_repository.get_by_user_id(user_id)
deleted_children_ids = []
total_feedings_deleted = 0
total_diapers_deleted = 0
total_sleeps_deleted = 0
# For each child, check if they have other parents
for child in children:
child_id = child["id"]
# Remove this user's relationship with the child
child_repository.remove_parent(child_id, user_id)
# Check if child has any remaining parents
remaining_parents = child_repository.get_parent_ids(child_id)
# Only delete child and logs if they have no other parents
if len(remaining_parents) == 0:
# Delete all logs for this orphaned child
feedings = feeding_repository.get_by_child_id(child_id)
for feeding in feedings:
feeding_repository.delete(feeding["id"])
total_feedings_deleted += 1
diapers = diaper_repository.get_by_child_id(child_id)
for diaper in diapers:
diaper_repository.delete(diaper["id"])
total_diapers_deleted += 1
sleeps = sleep_repository.get_by_child_id(child_id)
for sleep in sleeps:
sleep_repository.delete(sleep["id"])
total_sleeps_deleted += 1
# Delete the orphaned child
child_repository.delete(child_id)
deleted_children_ids.append(child_id)
# Finally, delete the user
user_repository.delete(user_id)
message = f"User '{user['username']}' deleted successfully"
if deleted_children_ids:
message += (
f" with {len(deleted_children_ids)} orphaned "
f"child{'ren' if len(deleted_children_ids) != 1 else ''}"
)
return DeleteUserResponse(
message=message,
deleted_children=deleted_children_ids,
deleted_feedings=total_feedings_deleted,
deleted_diapers=total_diapers_deleted,
deleted_sleeps=total_sleeps_deleted,
)
+111 -3
View File
@@ -3,6 +3,7 @@
import secrets
from fastapi import APIRouter, HTTPException, Depends, Header
from typing import Annotated
from pydantic import BaseModel
from baby_monitor.models.auth import (
LoginRequest,
@@ -11,22 +12,35 @@ from baby_monitor.models.auth import (
RegisterResponse,
)
from baby_monitor.repositories import (
get_child_repository,
get_diaper_change_repository,
get_feeding_repository,
get_invitation_repository,
get_sleep_repository,
get_token_repository,
get_user_repository,
)
from baby_monitor.repositories.dependencies.get_invitation_repository import (
get_invitation_repository,
)
from baby_monitor.repositories.interfaces import (
TokenRepositoryInterface,
UserRepositoryInterface,
InvitationRepositoryInterface,
ChildRepositoryInterface,
FeedingRepositoryInterface,
DiaperChangeRepositoryInterface,
SleepRepositoryInterface,
)
from baby_monitor.utils.password import hash_password, verify_password
router = APIRouter(prefix="/api", tags=["authentication"])
class ChangePasswordRequest(BaseModel):
"""Request model for password change."""
current_password: str
new_password: str
def verify_token(
authorization: Annotated[str | None, Header()] = None,
token_repo: TokenRepositoryInterface = Depends(get_token_repository),
@@ -191,3 +205,97 @@ def get_current_user(
"username": user["username"],
"is_admin": user.get("is_admin", False),
}
@router.post("/change-password")
def change_password(
request: ChangePasswordRequest,
user_id: Annotated[int, Depends(verify_token)],
user_repo: Annotated[UserRepositoryInterface, Depends(get_user_repository)], # noqa: E501
) -> dict:
"""Change password for the current user."""
# Get user with credentials
user = user_repo.get_by_id(user_id)
if not user:
raise HTTPException(status_code=404, detail="User not found")
# Verify current password
if not verify_password(request.current_password, user["hashed_password"]):
raise HTTPException(status_code=401, detail="Current password is incorrect")
# Hash new password
new_password_hash = hash_password(request.new_password)
# Update password
success = user_repo.update_password(user_id, new_password_hash)
if not success:
raise HTTPException(status_code=500, detail="Failed to update password")
return {"message": "Password changed successfully"}
@router.delete("/account")
def delete_account(
user_id: Annotated[int, Depends(verify_token)],
user_repo: Annotated[UserRepositoryInterface, Depends(get_user_repository)], # noqa: E501
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)], # noqa: E501
feeding_repo: Annotated[
FeedingRepositoryInterface, Depends(get_feeding_repository)
], # noqa: E501
diaper_repo: Annotated[
DiaperChangeRepositoryInterface, Depends(get_diaper_change_repository)
], # noqa: E501
sleep_repo: Annotated[SleepRepositoryInterface, Depends(get_sleep_repository)], # noqa: E501
) -> dict:
"""Delete current user's account and cascade delete orphaned children."""
# Get user's children
children = child_repo.get_by_user_id(user_id)
deleted_children = []
deleted_feedings = 0
deleted_diapers = 0
deleted_sleeps = 0
# Process each child
for child in children:
child_id = child["id"]
# Remove the parent-child relationship
child_repo.remove_parent(child_id, user_id)
# Check if child has any remaining parents
remaining_parents = child_repo.get_parent_ids(child_id)
if len(remaining_parents) == 0:
# Child is orphaned, delete all logs first
feedings = feeding_repo.get_by_child_id(child_id)
for feeding in feedings:
feeding_repo.delete(feeding["id"])
deleted_feedings += 1
diapers = diaper_repo.get_by_child_id(child_id)
for diaper in diapers:
diaper_repo.delete(diaper["id"])
deleted_diapers += 1
sleeps = sleep_repo.get_by_child_id(child_id)
for sleep in sleeps:
sleep_repo.delete(sleep["id"])
deleted_sleeps += 1
# Now delete the child
child_repo.delete(child_id)
deleted_children.append(child["name"])
# Finally, delete the user
user_repo.delete(user_id)
return {
"message": "Account deleted successfully",
"deleted_children": deleted_children,
"deleted_logs": {
"feedings": deleted_feedings,
"diaper_changes": deleted_diapers,
"sleep_sessions": deleted_sleeps,
},
}
+120 -2
View File
@@ -1,7 +1,10 @@
"""Child management router."""
import secrets
from datetime import datetime, timedelta, UTC
from typing import Annotated
from fastapi import APIRouter, HTTPException, Depends
from pydantic import BaseModel
from baby_monitor.models.child import CreateChildRequest, ChildResponse
from baby_monitor.routers.auth import verify_token
@@ -9,10 +12,35 @@ from baby_monitor.repositories.child.sqlite_child import SQLiteChildRepository
from baby_monitor.repositories.dependencies.get_child_repository import (
get_child_repository,
)
from baby_monitor.repositories.dependencies.get_child_invitation_repository import ( # noqa: E501
get_child_invitation_repository,
)
from baby_monitor.repositories.interfaces import ChildInvitationRepositoryInterface # noqa: E501
router = APIRouter(prefix="/api/children", tags=["children"])
class CreateChildInvitationRequest(BaseModel):
"""Request model for creating a child invitation."""
child_id: int
class ChildInvitationResponse(BaseModel):
"""Response model for child invitation."""
code: str
child_id: int
expires_at: str
message: str
class RedeemChildInvitationRequest(BaseModel):
"""Request model for redeeming a child invitation."""
code: str
@router.post("", response_model=ChildResponse, status_code=201)
def create_child(
request: CreateChildRequest,
@@ -53,7 +81,8 @@ def get_child(
raise HTTPException(status_code=404, detail="Child not found")
# Verify the child belongs to the authenticated user
if child["user_id"] != user_id:
parent_ids = child_repo.get_parent_ids(child_id)
if user_id not in parent_ids:
raise HTTPException(status_code=403, detail="Access denied")
return ChildResponse(**child)
@@ -73,7 +102,8 @@ def update_child(
if not child:
raise HTTPException(status_code=404, detail="Child not found")
if child["user_id"] != user_id:
parent_ids = child_repo.get_parent_ids(child_id)
if user_id not in parent_ids:
raise HTTPException(status_code=403, detail="Access denied")
# Update the child
@@ -88,3 +118,91 @@ def update_child(
raise HTTPException(status_code=500, detail="Update failed")
return ChildResponse(**updated_child)
@router.post("/invitations", response_model=ChildInvitationResponse)
def create_child_invitation(
request: CreateChildInvitationRequest,
user_id: Annotated[int, Depends(verify_token)],
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)], # noqa: E501
invitation_repo: Annotated[
ChildInvitationRepositoryInterface, Depends(get_child_invitation_repository)
], # noqa: E501
) -> ChildInvitationResponse:
"""Create an invitation code to share child access with another user."""
# Verify the child exists and user has access
child = child_repo.get_by_id(request.child_id)
if not child:
raise HTTPException(status_code=404, detail="Child not found")
parent_ids = child_repo.get_parent_ids(request.child_id)
if user_id not in parent_ids:
raise HTTPException(status_code=403, detail="Access denied")
# Generate a short invitation code (8 characters)
code = secrets.token_urlsafe(6)[:8].upper()
# Calculate expiration (7 days from now)
expires_at = datetime.now(UTC) + timedelta(days=7)
# Create the invitation
invitation_repo.create_invitation(
code=code,
child_id=request.child_id,
created_by_user_id=user_id,
expires_at=expires_at,
)
return ChildInvitationResponse(
code=code,
child_id=request.child_id,
expires_at=expires_at.isoformat(),
message="Invitation code created. Valid for 7 days.",
)
@router.post("/invitations/redeem")
def redeem_child_invitation(
request: RedeemChildInvitationRequest,
user_id: Annotated[int, Depends(verify_token)],
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)], # noqa: E501
invitation_repo: Annotated[
ChildInvitationRepositoryInterface, Depends(get_child_invitation_repository)
], # noqa: E501
) -> dict:
"""Redeem an invitation code to gain access to a child."""
# Verify the invitation code
if not invitation_repo.verify_invitation(request.code):
raise HTTPException(
status_code=400, detail="Invalid or expired invitation code"
)
# Get the invitation details
invitation = invitation_repo.get_by_code(request.code)
if not invitation:
raise HTTPException(status_code=400, detail="Invalid invitation code")
child_id = invitation["child_id"]
# Check if user already has access to this child
parent_ids = child_repo.get_parent_ids(child_id)
if user_id in parent_ids:
raise HTTPException(
status_code=400, detail="You already have access to this child"
)
# Add user as a parent
child_repo.add_parent(child_id, user_id)
# Consume the invitation
invitation_repo.consume_invitation(request.code, user_id, datetime.now(UTC))
# Get child details
child = child_repo.get_by_id(child_id)
if not child:
raise HTTPException(status_code=404, detail="Child not found")
return {
"message": f"Successfully added access to {child['name']}",
"child": ChildResponse(**child),
}
+143
View File
@@ -0,0 +1,143 @@
"""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,
)
from baby_monitor.utils.access_control import verify_child_access
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
verify_child_access(child_repo, request.child_id, user_id)
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
verify_child_access(child_repo, diaper_change["child_id"], user_id)
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
verify_child_access(child_repo, diaper_change["child_id"], user_id)
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
verify_child_access(child_repo, diaper_change["child_id"], user_id)
success = diaper_repo.delete(diaper_change_id)
if not success:
raise HTTPException(
status_code=500, detail="Failed to delete diaper change log"
)
+5 -15
View File
@@ -19,6 +19,7 @@ from baby_monitor.repositories.child.sqlite_child import SQLiteChildRepository
from baby_monitor.repositories.dependencies.get_child_repository import (
get_child_repository,
)
from baby_monitor.utils.access_control import verify_child_access
router = APIRouter(prefix="/api/feedings", tags=["feedings"])
@@ -32,12 +33,7 @@ def create_feeding(
) -> 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")
verify_child_access(child_repo, request.child_id, user_id)
feeding = feeding_repo.create(
child_id=request.child_id,
@@ -95,9 +91,7 @@ def get_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")
verify_child_access(child_repo, feeding["child_id"], user_id)
return FeedingResponse(**feeding)
@@ -117,9 +111,7 @@ def update_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")
verify_child_access(child_repo, feeding["child_id"], user_id)
# Update the feeding
updated_feeding = feeding_repo.update(
@@ -149,9 +141,7 @@ def delete_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")
verify_child_access(child_repo, feeding["child_id"], user_id)
success = feeding_repo.delete(feeding_id)
if not success:
+141
View File
@@ -0,0 +1,141 @@
"""Sleep log management router."""
from typing import Annotated
from fastapi import APIRouter, HTTPException, Depends
from baby_monitor.models.sleep import (
CreateSleepRequest,
UpdateSleepRequest,
SleepResponse,
)
from baby_monitor.routers.auth import verify_token
from baby_monitor.repositories.sleep.sqlite_sleep import SQLiteSleepRepository
from baby_monitor.repositories.dependencies.get_sleep_repository import (
get_sleep_repository,
)
from baby_monitor.repositories.child.sqlite_child import SQLiteChildRepository
from baby_monitor.repositories.dependencies.get_child_repository import (
get_child_repository,
)
from baby_monitor.utils.access_control import verify_child_access
router = APIRouter(prefix="/api/sleep", tags=["sleep"])
@router.post("", response_model=SleepResponse, status_code=201)
def create_sleep(
request: CreateSleepRequest,
user_id: Annotated[int, Depends(verify_token)],
sleep_repo: Annotated[SQLiteSleepRepository, Depends(get_sleep_repository)],
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
) -> SleepResponse:
"""Create a new sleep log entry."""
# Verify the child belongs to the authenticated user
verify_child_access(child_repo, request.child_id, user_id)
sleep = sleep_repo.create(
child_id=request.child_id,
start_time=request.start_time,
)
return SleepResponse(**sleep)
@router.get("/active", response_model=SleepResponse | None)
def get_active_sleep(
user_id: Annotated[int, Depends(verify_token)],
sleep_repo: Annotated[SQLiteSleepRepository, Depends(get_sleep_repository)],
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
) -> SleepResponse | None:
"""Get the current active sleep (where end_time is null) for the user."""
sleeps = sleep_repo.get_by_user_id(user_id)
# Find the first sleep with no end_time
for sleep in sleeps:
if sleep["end_time"] is None:
# Get child info to include in response
child = child_repo.get_by_id(sleep["child_id"])
response_data = sleep.copy()
if child:
response_data["child_name"] = child["name"]
return SleepResponse(**response_data)
return None
@router.get("", response_model=list[SleepResponse])
def get_user_sleeps(
user_id: Annotated[int, Depends(verify_token)],
sleep_repo: Annotated[SQLiteSleepRepository, Depends(get_sleep_repository)],
) -> list[SleepResponse]:
"""Get all sleep logs for the authenticated user's children."""
sleeps = sleep_repo.get_by_user_id(user_id)
return [SleepResponse(**sleep) for sleep in sleeps]
@router.get("/{sleep_id}", response_model=SleepResponse)
def get_sleep(
sleep_id: int,
user_id: Annotated[int, Depends(verify_token)],
sleep_repo: Annotated[SQLiteSleepRepository, Depends(get_sleep_repository)],
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
) -> SleepResponse:
"""Get a specific sleep log by ID."""
sleep = sleep_repo.get_by_id(sleep_id)
if not sleep:
raise HTTPException(status_code=404, detail="Sleep log not found")
# Verify the sleep belongs to user's child
verify_child_access(child_repo, sleep["child_id"], user_id)
return SleepResponse(**sleep)
@router.put("/{sleep_id}", response_model=SleepResponse)
def update_sleep(
sleep_id: int,
request: UpdateSleepRequest,
user_id: Annotated[int, Depends(verify_token)],
sleep_repo: Annotated[SQLiteSleepRepository, Depends(get_sleep_repository)],
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
) -> SleepResponse:
"""Update an existing sleep log."""
sleep = sleep_repo.get_by_id(sleep_id)
if not sleep:
raise HTTPException(status_code=404, detail="Sleep log not found")
# Verify the sleep belongs to user's child
verify_child_access(child_repo, sleep["child_id"], user_id)
updated = sleep_repo.update(
sleep_id=sleep_id,
end_time=request.end_time,
)
if not updated:
raise HTTPException(status_code=500, detail="Failed to update sleep log")
return SleepResponse(**updated)
@router.delete("/{sleep_id}", status_code=204)
def delete_sleep(
sleep_id: int,
user_id: Annotated[int, Depends(verify_token)],
sleep_repo: Annotated[SQLiteSleepRepository, Depends(get_sleep_repository)],
child_repo: Annotated[SQLiteChildRepository, Depends(get_child_repository)],
) -> None:
"""Delete a sleep log."""
sleep = sleep_repo.get_by_id(sleep_id)
if not sleep:
raise HTTPException(status_code=404, detail="Sleep log not found")
# Verify the sleep belongs to user's child
verify_child_access(child_repo, sleep["child_id"], user_id)
success = sleep_repo.delete(sleep_id)
if not success:
raise HTTPException(status_code=500, detail="Failed to delete sleep log")
+349 -1
View File
@@ -185,6 +185,172 @@
background: #c82333;
box-shadow: 0 4px 12px rgba(220, 53, 69, 0.4);
}
.user-management h2::before {
content: "👥";
}
.search-box {
width: 100%;
padding: 10px;
border: 1px solid #ddd;
border-radius: 4px;
font-size: 14px;
margin-bottom: 15px;
}
.user-list {
max-height: 400px;
overflow-y: auto;
border: 1px solid #ddd;
border-radius: 4px;
}
.user-item {
display: flex;
justify-content: space-between;
align-items: center;
padding: 12px;
border-bottom: 1px solid #eee;
background: white;
}
.user-item:last-child {
border-bottom: none;
}
.user-item:hover {
background: #f8f9fa;
}
.user-info {
flex: 1;
}
.user-name {
font-weight: 600;
color: #333;
margin-bottom: 4px;
}
.user-meta {
font-size: 12px;
color: #666;
}
.admin-badge {
display: inline-block;
padding: 2px 8px;
background: #667eea;
color: white;
border-radius: 3px;
font-size: 11px;
font-weight: 600;
margin-left: 8px;
}
.delete-user-btn {
padding: 6px 12px;
background: #dc3545;
color: white;
border: none;
border-radius: 4px;
font-size: 13px;
cursor: pointer;
transition: background 0.2s;
}
.delete-user-btn:hover {
background: #c82333;
}
.delete-user-btn:disabled {
background: #ccc;
cursor: not-allowed;
}
.modal {
display: none;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.5);
z-index: 1000;
justify-content: center;
align-items: center;
}
.modal.show {
display: flex;
}
.modal-content {
background: white;
padding: 30px;
border-radius: 8px;
max-width: 500px;
width: 90%;
box-shadow: 0 10px 40px rgba(0, 0, 0, 0.3);
}
.modal h3 {
color: #333;
margin-bottom: 15px;
}
.modal p {
color: #666;
margin-bottom: 20px;
line-height: 1.5;
}
.modal-buttons {
display: flex;
gap: 10px;
justify-content: flex-end;
}
.modal-button {
padding: 10px 20px;
border: none;
border-radius: 4px;
font-size: 14px;
font-weight: 600;
cursor: pointer;
transition: background 0.2s;
}
.modal-button.cancel {
background: #6c757d;
color: white;
}
.modal-button.cancel:hover {
background: #5a6268;
}
.modal-button.confirm {
background: #dc3545;
color: white;
}
.modal-button.confirm:hover {
background: #c82333;
}
.empty-state {
text-align: center;
padding: 40px 20px;
color: #999;
}
.loading {
text-align: center;
padding: 20px;
color: #666;
}
</style>
</head>
<body>
@@ -218,9 +384,46 @@
<div id="error" class="error"></div>
</div>
<div class="section user-management">
<h2>User Management</h2>
<p style="color: #666; margin-bottom: 15px; font-size: 14px">
View and manage all users in the system.
</p>
<input
type="text"
id="userSearch"
class="search-box"
placeholder="Search users by username..."
oninput="filterUsers()"
/>
<div id="userListContainer" class="loading">Loading users...</div>
</div>
<button class="button logout-button" onclick="logout()">Logout</button>
</div>
<!-- Delete Confirmation Modal -->
<div class="modal" id="deleteModal">
<div class="modal-content">
<h3>⚠️ Confirm User Deletion</h3>
<p id="deleteMessage"></p>
<p style="color: #dc3545; font-weight: 600">
This action cannot be undone. All associated children and their logs
(feedings, diapers, sleep) will be permanently deleted.
</p>
<div class="modal-buttons">
<button class="modal-button cancel" onclick="closeDeleteModal()">
Cancel
</button>
<button class="modal-button confirm" onclick="confirmDelete()">
Delete User
</button>
</div>
</div>
</div>
<script>
// Check if user is authenticated and is admin
const token = localStorage.getItem("access_token");
@@ -228,7 +431,10 @@
window.location.href = "/login.html";
}
// Verify user is admin
let allUsers = [];
let userToDelete = null;
// Verify user is admin and load data
fetch("/api/me", {
headers: {
Authorization: `Bearer ${token}`,
@@ -240,12 +446,154 @@
alert("Access denied. Admin privileges required.");
window.location.href = "/";
}
// Load users after verifying admin status
loadUsers();
})
.catch((error) => {
console.error("Error verifying admin status:", error);
window.location.href = "/login.html";
});
async function loadUsers() {
const container = document.getElementById("userListContainer");
try {
const response = await fetch("/api/admin/users", {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (!response.ok) {
throw new Error("Failed to load users");
}
allUsers = await response.json();
renderUsers(allUsers);
} catch (error) {
console.error("Error loading users:", error);
container.innerHTML = `
<div class="empty-state">
❌ Failed to load users: ${error.message}
</div>
`;
}
}
function renderUsers(users) {
const container = document.getElementById("userListContainer");
if (users.length === 0) {
container.innerHTML = `
<div class="empty-state">
No users found.
</div>
`;
return;
}
container.className = "user-list";
container.innerHTML = users
.map(
(user) => `
<div class="user-item">
<div class="user-info">
<div class="user-name">
${user.username}
${user.is_admin ? '<span class="admin-badge">ADMIN</span>' : ""}
</div>
<div class="user-meta">
ID: ${user.id} • Created: ${new Date(user.created_at).toLocaleDateString()}
</div>
</div>
<button
class="delete-user-btn"
onclick="showDeleteModal(${user.id}, '${user.username}', ${user.is_admin})"
${user.is_admin ? 'disabled title="Cannot delete admin users"' : ""}
>
Delete
</button>
</div>
`,
)
.join("");
}
function filterUsers() {
const searchTerm = document
.getElementById("userSearch")
.value.toLowerCase();
const filtered = allUsers.filter((user) =>
user.username.toLowerCase().includes(searchTerm),
);
renderUsers(filtered);
}
function showDeleteModal(userId, username, isAdmin) {
if (isAdmin) {
return; // Don't allow deleting admin users
}
userToDelete = { id: userId, username };
const modal = document.getElementById("deleteModal");
const message = document.getElementById("deleteMessage");
message.textContent = `Are you sure you want to delete user "${username}"?`;
modal.classList.add("show");
}
function closeDeleteModal() {
const modal = document.getElementById("deleteModal");
modal.classList.remove("show");
userToDelete = null;
}
async function confirmDelete() {
if (!userToDelete) return;
const modal = document.getElementById("deleteModal");
const confirmBtn = modal.querySelector(".modal-button.confirm");
confirmBtn.disabled = true;
confirmBtn.textContent = "Deleting...";
try {
const response = await fetch(`/api/admin/users/${userToDelete.id}`, {
method: "DELETE",
headers: {
Authorization: `Bearer ${token}`,
},
});
if (!response.ok) {
const error = await response.json();
throw new Error(error.detail || "Failed to delete user");
}
const result = await response.json();
// Show success message
alert(
`${result.message}\n\n` +
`Deleted:\n` +
`${result.deleted_children.length} children\n` +
`${result.deleted_feedings} feedings\n` +
`${result.deleted_diapers} diaper changes\n` +
`${result.deleted_sleeps} sleep sessions`,
);
// Reload user list
await loadUsers();
closeDeleteModal();
} catch (error) {
console.error("Error deleting user:", error);
alert(`Failed to delete user: ${error.message}`);
} finally {
confirmBtn.disabled = false;
confirmBtn.textContent = "Delete User";
}
}
async function generateLink() {
const btn = document.getElementById("generateBtn");
const linkContainer = document.getElementById("linkContainer");
+957
View File
@@ -0,0 +1,957 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Diapers - Baby Monitor</title>
<link rel="stylesheet" href="/menu.css" />
<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, #f093fb 0%, #f5576c 100%);
min-height: 100vh;
padding: 20px;
}
.container {
background: white;
border-radius: 12px;
box-shadow: 0 10px 40px rgba(0, 0, 0, 0.2);
padding: 40px;
max-width: 1000px;
margin: 0 auto;
}
h1 {
color: #333;
margin-bottom: 10px;
font-size: 28px;
}
.subtitle {
color: #666;
margin-bottom: 30px;
font-size: 14px;
}
.button {
background: linear-gradient(135deg, #f093fb 0%, #f5576c 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;
text-decoration: none;
display: inline-block;
}
.button:hover {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(240, 147, 251, 0.4);
}
.button.secondary {
background: #6c757d;
margin-left: 10px;
}
.button.secondary:hover {
box-shadow: 0 4px 12px rgba(108, 117, 125, 0.4);
}
.loading {
text-align: center;
padding: 40px;
color: #666;
}
.empty-state {
text-align: center;
padding: 60px 20px;
color: #666;
}
.empty-state-icon {
font-size: 64px;
margin-bottom: 20px;
}
.empty-state h2 {
color: #333;
margin-bottom: 10px;
}
.empty-state p {
margin-bottom: 30px;
}
.chart-container {
margin-bottom: 40px;
padding: 20px;
background: #f8f9fa;
border-radius: 8px;
}
.chart-container h2 {
color: #333;
margin-bottom: 20px;
font-size: 20px;
}
.chart-wrapper {
position: relative;
height: 300px;
}
.charts-row {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 20px;
margin-bottom: 40px;
}
@media (max-width: 768px) {
.charts-row {
grid-template-columns: 1fr;
}
}
.controls {
margin-bottom: 30px;
display: flex;
align-items: center;
gap: 15px;
flex-wrap: wrap;
}
.controls label {
font-weight: 600;
color: #333;
}
.controls select {
padding: 8px 16px;
border: 1px solid #ddd;
border-radius: 6px;
font-size: 14px;
cursor: pointer;
background: white;
}
.controls select:focus {
outline: none;
border-color: #f093fb;
}
.diapers-list {
margin-top: 40px;
}
.diapers-list h2 {
color: #333;
margin-bottom: 20px;
font-size: 20px;
}
.diapers-scroll {
max-height: 500px;
overflow-y: auto;
border: 1px solid #ddd;
border-radius: 8px;
background: #f8f9fa;
}
.diaper-item {
display: flex;
justify-content: space-between;
align-items: center;
padding: 15px 20px;
background: white;
border-bottom: 1px solid #eee;
transition: background 0.2s;
}
.diaper-item:hover {
background: #f8f9fa;
}
.diaper-item:last-child {
border-bottom: none;
}
.diaper-info-left {
flex: 1;
}
.diaper-time {
font-weight: 600;
color: #333;
margin-bottom: 5px;
}
.diaper-details {
font-size: 14px;
color: #666;
}
.diaper-badge {
display: inline-block;
padding: 4px 8px;
border-radius: 4px;
font-size: 12px;
font-weight: 600;
margin-right: 8px;
}
.diaper-badge.poop {
background: rgba(139, 69, 19, 0.1);
color: rgba(139, 69, 19, 1);
}
.diaper-badge.pee {
background: rgba(255, 215, 0, 0.2);
color: rgba(184, 134, 11, 1);
}
.edit-button {
background: #f093fb;
color: white;
border: none;
padding: 8px 16px;
border-radius: 4px;
font-size: 13px;
font-weight: 600;
cursor: pointer;
transition: background 0.2s;
}
.edit-button:hover {
background: #d77ee6;
}
</style>
</head>
<body>
<div class="container">
<h1>🧷 Diaper Changes</h1>
<p class="subtitle">Overview of all diaper change sessions</p>
<div id="content" class="loading">
<p>Loading...</p>
</div>
</div>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/chart.umd.min.js"></script>
<script src="/menu.js"></script>
<script>
// Check if user is authenticated
const token = localStorage.getItem("access_token");
if (!token) {
window.location.href = "/login.html";
}
// Initialize burger menu
initBurgerMenu({ includeHome: true });
let allDiaperChanges = [];
let allChildren = [];
let currentDaysRange = 7;
let selectedChildId = null; // null means "All Children"
// Load diaper changes data
async function loadDiaperChanges() {
try {
const response = await fetch("/api/diaper-changes", {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (response.ok) {
allDiaperChanges = await response.json();
await loadChildren();
displayDiaperChanges(allDiaperChanges);
} else {
showError("Failed to load diaper changes");
}
} catch (error) {
console.error("Error:", error);
showError("Network error. Please try again.");
}
}
// Load children data
async function loadChildren() {
try {
const response = await fetch("/api/children", {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (response.ok) {
allChildren = await response.json();
}
} catch (error) {
console.error("Error loading children:", error);
}
}
function onDaysRangeChange(event) {
currentDaysRange = parseInt(event.target.value);
displayDiaperChanges(allDiaperChanges);
}
function onChildChange(event) {
selectedChildId =
event.target.value === "all" ? null : parseInt(event.target.value);
displayDiaperChanges(allDiaperChanges);
}
function displayDiaperChanges(diaperChanges) {
const content = document.getElementById("content");
if (diaperChanges.length === 0) {
content.innerHTML = `
<div class="empty-state">
<div class="empty-state-icon">🧷</div>
<h2>No Diaper Changes Yet</h2>
<p>Start tracking diaper changes from the home page</p>
</div>
`;
} else {
// Prepare chart data
const barChartData = prepareBarChartData(diaperChanges);
const poopPieData = preparePoopPieChartData(diaperChanges);
const peePieData = preparePeePieChartData(diaperChanges);
// Build child dropdown options
const childOptions = allChildren
.map(
(child) =>
`<option value="${child.id}" ${selectedChildId === child.id ? "selected" : ""}>${child.name}</option>`,
)
.join("");
content.innerHTML = `
<div class="controls">
<label for="childFilter">Child:</label>
<select id="childFilter" onchange="onChildChange(event)">
<option value="all" ${selectedChildId === null ? "selected" : ""}>All Children</option>
${childOptions}
</select>
<label for="daysRange">Time Range:</label>
<select id="daysRange" onchange="onDaysRangeChange(event)">
<option value="1" ${currentDaysRange === 1 ? "selected" : ""}>Last 24 Hours</option>
<option value="3" ${currentDaysRange === 3 ? "selected" : ""}>Last 3 Days</option>
<option value="7" ${currentDaysRange === 7 ? "selected" : ""}>Last 7 Days</option>
<option value="14" ${currentDaysRange === 14 ? "selected" : ""}>Last 14 Days</option>
<option value="30" ${currentDaysRange === 30 ? "selected" : ""}>Last 30 Days</option>
<option value="90" ${currentDaysRange === 90 ? "selected" : ""}>Last 90 Days</option>
</select>
</div>
<div class="chart-container">
<h2>Diaper Changes Per Day (Last ${currentDaysRange} Day${currentDaysRange !== 1 ? "s" : ""})</h2>
<div class="chart-wrapper">
<canvas id="diaperChart"></canvas>
</div>
</div>
<div class="charts-row">
<div class="chart-container">
<h2>💩 Poop Distribution</h2>
<div class="chart-wrapper">
<canvas id="poopPieChart"></canvas>
</div>
</div>
<div class="chart-container">
<h2>💧 Pee Distribution</h2>
<div class="chart-wrapper">
<canvas id="peePieChart"></canvas>
</div>
</div>
</div>
`;
// Render charts
renderBarChart(barChartData);
renderPoopPieChart(poopPieData);
renderPeePieChart(peePieData);
// Render diaper change list
renderDiaperList(diaperChanges);
}
}
function renderDiaperList(diaperChanges) {
// Filter by current time range
const now = new Date();
const daysAgo = new Date(now);
daysAgo.setDate(daysAgo.getDate() - currentDaysRange);
daysAgo.setHours(0, 0, 0, 0);
let filteredChanges = diaperChanges.filter((dc) => {
const changeDate = new Date(dc.change_time);
return changeDate >= daysAgo;
});
// Filter by selected child if applicable
if (selectedChildId !== null) {
filteredChanges = filteredChanges.filter(
(dc) => dc.child_id === selectedChildId,
);
}
// Sort by most recent first
filteredChanges.sort((a, b) => {
return new Date(b.change_time) - new Date(a.change_time);
});
const listHtml = filteredChanges
.map((dc) => {
const changeTime = new Date(dc.change_time);
const dateStr = changeTime.toLocaleDateString("en-US", {
month: "short",
day: "numeric",
year: "numeric",
});
const timeStr = changeTime.toLocaleTimeString("en-US", {
hour: "numeric",
minute: "2-digit",
});
// Build badges for poop and pee
let badges = [];
if (dc.poop_amount || dc.poop_color) {
const poopInfo = [dc.poop_amount, dc.poop_color]
.filter(Boolean)
.join(", ");
badges.push(
`<span class="diaper-badge poop">💩 ${poopInfo}</span>`,
);
}
if (dc.pee_amount || dc.pee_color) {
const peeInfo = [dc.pee_amount, dc.pee_color]
.filter(Boolean)
.join(", ");
badges.push(
`<span class="diaper-badge pee">💧 ${peeInfo}</span>`,
);
}
if (badges.length === 0) {
badges.push(
'<span class="diaper-badge" style="background: #f0f0f0; color: #666;">Clean diaper</span>',
);
}
// Get child name
const child = allChildren.find((c) => c.id === dc.child_id);
const childName = child ? child.name : "Unknown";
return `
<div class="diaper-item">
<div class="diaper-info-left">
<div class="diaper-time">${dateStr} at ${timeStr}${selectedChildId === null ? ` - ${childName}` : ""}</div>
<div class="diaper-details">
${badges.join("")}
</div>
</div>
<button class="edit-button" onclick="editDiaperChange(${dc.id})">Edit</button>
</div>
`;
})
.join("");
const listContainer = `
<div class="diapers-list">
<div style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 20px;">
<h2 style="margin: 0;">Diaper Change History</h2>
<button class="button" onclick="addManualDiaperChange()" style="padding: 8px 16px; font-size: 14px;"> Add Manual Entry</button>
</div>
<div class="diapers-scroll">
${listHtml || '<div class="diaper-item">No diaper changes in this time range</div>'}
</div>
</div>
`;
const content = document.getElementById("content");
content.insertAdjacentHTML("beforeend", listContainer);
}
function editDiaperChange(diaperChangeId) {
window.location.href = `/log-diaper.html?id=${diaperChangeId}`;
}
function addManualDiaperChange() {
window.location.href = `/log-diaper.html`;
}
function preparePoopPieChartData(diaperChanges) {
const now = new Date();
const daysAgo = new Date(now);
daysAgo.setDate(daysAgo.getDate() - currentDaysRange);
daysAgo.setHours(0, 0, 0, 0);
// Filter by time range
let recentChanges = diaperChanges.filter((dc) => {
const changeDate = new Date(dc.change_time);
return changeDate >= daysAgo;
});
// Filter by selected child if applicable
if (selectedChildId !== null) {
recentChanges = recentChanges.filter(
(dc) => dc.child_id === selectedChildId,
);
}
// Count poop amounts
const counts = {
light: 0,
medium: 0,
heavy: 0,
none: 0,
};
recentChanges.forEach((dc) => {
if (dc.poop_amount) {
counts[dc.poop_amount]++;
} else {
counts.none++;
}
});
// Only include categories with data
const labels = [];
const data = [];
const labelMap = {
light: "Light",
medium: "Medium",
heavy: "Heavy",
none: "No Poop",
};
Object.entries(counts).forEach(([type, count]) => {
if (count > 0) {
labels.push(labelMap[type]);
data.push(count);
}
});
return { labels, data };
}
function preparePeePieChartData(diaperChanges) {
const now = new Date();
const daysAgo = new Date(now);
daysAgo.setDate(daysAgo.getDate() - currentDaysRange);
daysAgo.setHours(0, 0, 0, 0);
// Filter by time range
let recentChanges = diaperChanges.filter((dc) => {
const changeDate = new Date(dc.change_time);
return changeDate >= daysAgo;
});
// Filter by selected child if applicable
if (selectedChildId !== null) {
recentChanges = recentChanges.filter(
(dc) => dc.child_id === selectedChildId,
);
}
// Count pee amounts
const counts = {
light: 0,
medium: 0,
heavy: 0,
none: 0,
};
recentChanges.forEach((dc) => {
if (dc.pee_amount) {
counts[dc.pee_amount]++;
} else {
counts.none++;
}
});
// Only include categories with data
const labels = [];
const data = [];
const labelMap = {
light: "Light",
medium: "Medium",
heavy: "Heavy",
none: "No Pee",
};
Object.entries(counts).forEach(([type, count]) => {
if (count > 0) {
labels.push(labelMap[type]);
data.push(count);
}
});
return { labels, data };
}
function prepareBarChartData(diaperChanges) {
const now = new Date();
const labels = [];
const poopData = [];
const peeData = [];
// Filter by selected child if applicable
let filteredChanges = diaperChanges;
if (selectedChildId !== null) {
filteredChanges = diaperChanges.filter(
(dc) => dc.child_id === selectedChildId,
);
}
// Create days based on currentDaysRange (including today)
for (let i = currentDaysRange - 1; i >= 0; i--) {
const date = new Date(now);
date.setDate(date.getDate() - i);
date.setHours(0, 0, 0, 0);
const dateStr = date.toLocaleDateString("en-US", {
month: "short",
day: "numeric",
});
labels.push(dateStr);
// Count poop and pee diapers for this day
const nextDay = new Date(date);
nextDay.setDate(nextDay.getDate() + 1);
const dayChanges = filteredChanges.filter((dc) => {
const changeDate = new Date(dc.change_time);
return changeDate >= date && changeDate < nextDay;
});
const poopCount = dayChanges.filter(
(dc) => dc.poop_amount !== null,
).length;
const peeCount = dayChanges.filter(
(dc) => dc.pee_amount !== null,
).length;
poopData.push(poopCount);
peeData.push(peeCount);
}
return { labels, poopData, peeData };
}
function renderBarChart(chartData) {
const ctx = document.getElementById("diaperChart").getContext("2d");
new Chart(ctx, {
type: "bar",
data: {
labels: chartData.labels,
datasets: [
{
label: "💩 Poop",
data: chartData.poopData,
backgroundColor: "rgba(139, 69, 19, 0.7)",
borderColor: "rgba(139, 69, 19, 1)",
borderWidth: 2,
borderRadius: 6,
},
{
label: "💧 Pee",
data: chartData.peeData,
backgroundColor: "rgba(255, 215, 0, 0.7)",
borderColor: "rgba(255, 215, 0, 1)",
borderWidth: 2,
borderRadius: 6,
},
],
},
options: {
responsive: true,
maintainAspectRatio: false,
plugins: {
legend: {
display: true,
position: "top",
labels: {
padding: 15,
font: {
size: 13,
},
},
},
tooltip: {
backgroundColor: "rgba(0, 0, 0, 0.8)",
padding: 12,
titleFont: {
size: 14,
},
bodyFont: {
size: 13,
},
callbacks: {
label: function (context) {
const count = context.parsed.y;
return `${context.dataset.label}: ${count}`;
},
},
},
},
scales: {
y: {
beginAtZero: true,
title: {
display: true,
text: "Number of Diapers",
font: {
size: 13,
weight: "600",
},
},
ticks: {
stepSize: 1,
font: {
size: 12,
},
},
grid: {
color: "rgba(0, 0, 0, 0.05)",
},
},
x: {
ticks: {
font: {
size: 12,
},
},
grid: {
display: false,
},
},
},
},
});
}
function renderPoopPieChart(chartData) {
const ctx = document.getElementById("poopPieChart").getContext("2d");
const colors = {
Light: {
bg: "rgba(139, 69, 19, 0.5)",
border: "rgba(139, 69, 19, 1)",
},
Medium: {
bg: "rgba(139, 69, 19, 0.7)",
border: "rgba(139, 69, 19, 1)",
},
Heavy: {
bg: "rgba(139, 69, 19, 0.9)",
border: "rgba(139, 69, 19, 1)",
},
"No Poop": {
bg: "rgba(200, 200, 200, 0.5)",
border: "rgba(200, 200, 200, 1)",
},
};
const backgroundColors = chartData.labels.map(
(label) => colors[label]?.bg || "rgba(200, 200, 200, 0.5)",
);
const borderColors = chartData.labels.map(
(label) => colors[label]?.border || "rgba(200, 200, 200, 1)",
);
new Chart(ctx, {
type: "pie",
data: {
labels: chartData.labels,
datasets: [
{
data: chartData.data,
backgroundColor: backgroundColors,
borderColor: borderColors,
borderWidth: 2,
},
],
},
options: {
responsive: true,
maintainAspectRatio: false,
plugins: {
legend: {
position: "bottom",
labels: {
padding: 20,
font: {
size: 13,
},
},
},
tooltip: {
backgroundColor: "rgba(0, 0, 0, 0.8)",
padding: 12,
titleFont: {
size: 14,
},
bodyFont: {
size: 13,
},
callbacks: {
label: function (context) {
const count = context.parsed;
const total = context.dataset.data.reduce(
(a, b) => a + b,
0,
);
const percentage =
total > 0 ? ((count / total) * 100).toFixed(1) : 0;
return `${context.label}: ${count} (${percentage}%)`;
},
},
},
},
},
});
}
function renderPeePieChart(chartData) {
const ctx = document.getElementById("peePieChart").getContext("2d");
const colors = {
Light: {
bg: "rgba(255, 215, 0, 0.5)",
border: "rgba(255, 215, 0, 1)",
},
Medium: {
bg: "rgba(255, 215, 0, 0.7)",
border: "rgba(255, 215, 0, 1)",
},
Heavy: {
bg: "rgba(255, 215, 0, 0.9)",
border: "rgba(255, 215, 0, 1)",
},
"No Pee": {
bg: "rgba(200, 200, 200, 0.5)",
border: "rgba(200, 200, 200, 1)",
},
};
const backgroundColors = chartData.labels.map(
(label) => colors[label]?.bg || "rgba(200, 200, 200, 0.5)",
);
const borderColors = chartData.labels.map(
(label) => colors[label]?.border || "rgba(200, 200, 200, 1)",
);
new Chart(ctx, {
type: "pie",
data: {
labels: chartData.labels,
datasets: [
{
data: chartData.data,
backgroundColor: backgroundColors,
borderColor: borderColors,
borderWidth: 2,
},
],
},
options: {
responsive: true,
maintainAspectRatio: false,
plugins: {
legend: {
position: "bottom",
labels: {
padding: 20,
font: {
size: 13,
},
},
},
tooltip: {
backgroundColor: "rgba(0, 0, 0, 0.8)",
padding: 12,
titleFont: {
size: 14,
},
bodyFont: {
size: 13,
},
callbacks: {
label: function (context) {
const count = context.parsed;
const total = context.dataset.data.reduce(
(a, b) => a + b,
0,
);
const percentage =
total > 0 ? ((count / total) * 100).toFixed(1) : 0;
return `${context.label}: ${count} (${percentage}%)`;
},
},
},
},
},
});
}
function showError(message) {
const content = document.getElementById("content");
content.innerHTML = `
<div class="empty-state">
<div class="empty-state-icon">⚠️</div>
<h2>Error</h2>
<p>${message}</p>
</div>
`;
}
async function logout() {
const token = localStorage.getItem("access_token");
try {
await fetch("/api/logout", {
method: "POST",
headers: {
Authorization: `Bearer ${token}`,
},
});
} catch (error) {
console.error("Logout error:", error);
} finally {
// Clear local storage and redirect
localStorage.removeItem("access_token");
localStorage.removeItem("username");
window.location.href = "/login.html";
}
}
// Load data on page load
loadDiaperChanges();
</script>
</body>
</html>
+81 -169
View File
@@ -4,6 +4,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Feedings - Baby Monitor</title>
<link rel="stylesheet" href="/menu.css" />
<style>
* {
margin: 0;
@@ -277,91 +278,9 @@
.edit-button:hover {
background: #5568d3;
}
.burger-menu {
position: fixed;
top: 1rem;
left: 1rem;
cursor: pointer;
z-index: 1000;
background: white;
padding: 0.5rem;
border-radius: 4px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
}
.burger-menu div {
width: 25px;
height: 3px;
background-color: #333;
margin: 5px 0;
transition: 0.3s;
}
.menu-overlay {
position: fixed;
top: 0;
left: -250px;
width: 250px;
height: 100vh;
background: white;
box-shadow: 2px 0 10px rgba(0, 0, 0, 0.1);
transition: left 0.3s;
z-index: 999;
padding: 4rem 1rem 1rem 1rem;
}
.menu-overlay.open {
left: 0;
}
.menu-backdrop {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100vh;
background: rgba(0, 0, 0, 0.5);
display: none;
z-index: 998;
}
.menu-backdrop.open {
display: block;
}
.menu-item {
padding: 1rem;
border-bottom: 1px solid #eee;
cursor: pointer;
transition: background 0.2s;
}
.menu-item:hover {
background: #f5f5f5;
}
.menu-item.logout {
color: #dc3545;
font-weight: 600;
}
</style>
</head>
<body>
<div class="burger-menu" id="burgerMenu">
<div></div>
<div></div>
<div></div>
</div>
<div class="menu-backdrop" id="menuBackdrop"></div>
<div class="menu-overlay" id="menuOverlay">
<div class="menu-item" id="menuHome">🏠 Home</div>
<div class="menu-item" id="menuAddChild">👶 Add Child</div>
<div class="menu-item logout" id="menuLogout">🚪 Logout</div>
</div>
<div class="container">
<h1>🍼 Feedings</h1>
<p class="subtitle">Overview of all feeding sessions</p>
@@ -372,6 +291,7 @@
</div>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/chart.umd.min.js"></script>
<script src="/menu.js"></script>
<script>
// Check if user is authenticated
const token = localStorage.getItem("access_token");
@@ -379,42 +299,14 @@
window.location.href = "/login.html";
}
// Initialize burger menu
initBurgerMenu({ includeHome: true });
let allFeedings = [];
let allChildren = [];
let currentDaysRange = 7;
let selectedChildId = null; // null means "All Children"
// Burger menu functionality
const burgerMenu = document.getElementById("burgerMenu");
const menuOverlay = document.getElementById("menuOverlay");
const menuBackdrop = document.getElementById("menuBackdrop");
function toggleMenu() {
menuOverlay.classList.toggle("open");
menuBackdrop.classList.toggle("open");
}
function closeMenu() {
menuOverlay.classList.remove("open");
menuBackdrop.classList.remove("open");
}
burgerMenu.addEventListener("click", toggleMenu);
menuBackdrop.addEventListener("click", closeMenu);
document.getElementById("menuHome").addEventListener("click", () => {
window.location.href = "/";
});
document.getElementById("menuAddChild").addEventListener("click", () => {
window.location.href = "/add-child.html";
});
document.getElementById("menuLogout").addEventListener("click", () => {
closeMenu();
logout();
});
// Load feedings data
async function loadFeedings() {
try {
@@ -460,7 +352,8 @@
}
function onChildChange(event) {
selectedChildId = event.target.value === "all" ? null : parseInt(event.target.value);
selectedChildId =
event.target.value === "all" ? null : parseInt(event.target.value);
displayFeedings(allFeedings);
}
@@ -482,31 +375,34 @@
const durationChartData = prepareDurationChartData(feedings);
// Build child dropdown options
const childOptions = allChildren.map(child =>
`<option value="${child.id}" ${selectedChildId === child.id ? 'selected' : ''}>${child.name}</option>`
).join('');
const childOptions = allChildren
.map(
(child) =>
`<option value="${child.id}" ${selectedChildId === child.id ? "selected" : ""}>${child.name}</option>`,
)
.join("");
content.innerHTML = `
<div class="controls">
<label for="childFilter">Child:</label>
<select id="childFilter" onchange="onChildChange(event)">
<option value="all" ${selectedChildId === null ? 'selected' : ''}>All Children</option>
<option value="all" ${selectedChildId === null ? "selected" : ""}>All Children</option>
${childOptions}
</select>
<label for="daysRange">Time Range:</label>
<select id="daysRange" onchange="onDaysRangeChange(event)">
<option value="1" ${currentDaysRange === 1 ? 'selected' : ''}>Last 24 Hours</option>
<option value="3" ${currentDaysRange === 3 ? 'selected' : ''}>Last 3 Days</option>
<option value="7" ${currentDaysRange === 7 ? 'selected' : ''}>Last 7 Days</option>
<option value="14" ${currentDaysRange === 14 ? 'selected' : ''}>Last 14 Days</option>
<option value="30" ${currentDaysRange === 30 ? 'selected' : ''}>Last 30 Days</option>
<option value="90" ${currentDaysRange === 90 ? 'selected' : ''}>Last 90 Days</option>
<option value="1" ${currentDaysRange === 1 ? "selected" : ""}>Last 24 Hours</option>
<option value="3" ${currentDaysRange === 3 ? "selected" : ""}>Last 3 Days</option>
<option value="7" ${currentDaysRange === 7 ? "selected" : ""}>Last 7 Days</option>
<option value="14" ${currentDaysRange === 14 ? "selected" : ""}>Last 14 Days</option>
<option value="30" ${currentDaysRange === 30 ? "selected" : ""}>Last 30 Days</option>
<option value="90" ${currentDaysRange === 90 ? "selected" : ""}>Last 90 Days</option>
</select>
</div>
<div class="chart-container">
<h2>Feedings Per Day (Last ${currentDaysRange} Day${currentDaysRange !== 1 ? 's' : ''})</h2>
<h2>Feedings Per Day (Last ${currentDaysRange} Day${currentDaysRange !== 1 ? "s" : ""})</h2>
<div class="chart-wrapper">
<canvas id="feedingsChart"></canvas>
</div>
@@ -533,7 +429,7 @@
renderBarChart(barChartData);
renderPieChart(pieChartData);
renderDurationChart(durationChartData);
// Render feeding list
renderFeedingList(feedings);
}
@@ -553,7 +449,9 @@
// Filter by selected child if applicable
if (selectedChildId !== null) {
filteredFeedings = filteredFeedings.filter((f) => f.child_id === selectedChildId);
filteredFeedings = filteredFeedings.filter(
(f) => f.child_id === selectedChildId,
);
}
// Sort by most recent first
@@ -561,45 +459,49 @@
return new Date(b.start_time) - new Date(a.start_time);
});
const listHtml = filteredFeedings.map((feeding) => {
const startTime = new Date(feeding.start_time);
const endTime = feeding.end_time ? new Date(feeding.end_time) : null;
const dateStr = startTime.toLocaleDateString("en-US", {
month: "short",
day: "numeric",
year: "numeric",
});
const timeStr = startTime.toLocaleTimeString("en-US", {
hour: "numeric",
minute: "2-digit",
});
const listHtml = filteredFeedings
.map((feeding) => {
const startTime = new Date(feeding.start_time);
const endTime = feeding.end_time
? new Date(feeding.end_time)
: null;
const duration = endTime
? Math.round((endTime - startTime) / 60000)
: null;
const dateStr = startTime.toLocaleDateString("en-US", {
month: "short",
day: "numeric",
year: "numeric",
});
const typeClass = feeding.feeding_type.replace("_", "-");
const typeLabel = formatFeedingType(feeding.feeding_type);
const timeStr = startTime.toLocaleTimeString("en-US", {
hour: "numeric",
minute: "2-digit",
});
// Get child name
const child = allChildren.find(c => c.id === feeding.child_id);
const childName = child ? child.name : "Unknown";
const duration = endTime
? Math.round((endTime - startTime) / 60000)
: null;
return `
const typeClass = feeding.feeding_type.replace("_", "-");
const typeLabel = formatFeedingType(feeding.feeding_type);
// Get child name
const child = allChildren.find((c) => c.id === feeding.child_id);
const childName = child ? child.name : "Unknown";
return `
<div class="feeding-item">
<div class="feeding-info-left">
<div class="feeding-time">${dateStr} at ${timeStr}${selectedChildId === null ? ` - ${childName}` : ''}</div>
<div class="feeding-time">${dateStr} at ${timeStr}${selectedChildId === null ? ` - ${childName}` : ""}</div>
<div class="feeding-details">
<span class="feeding-type-badge ${typeClass}">${typeLabel}</span>
${duration !== null ? `${duration} minutes` : 'Ongoing'}
${duration !== null ? `${duration} minutes` : "Ongoing"}
</div>
</div>
<button class="edit-button" onclick="editFeeding(${feeding.id})">Edit</button>
</div>
`;
}).join("");
})
.join("");
const listContainer = `
<div class="feedings-list">
@@ -614,7 +516,7 @@
`;
const content = document.getElementById("content");
content.insertAdjacentHTML('beforeend', listContainer);
content.insertAdjacentHTML("beforeend", listContainer);
}
function formatFeedingType(type) {
@@ -650,7 +552,9 @@
// Filter by selected child if applicable
if (selectedChildId !== null) {
recentFeedings = recentFeedings.filter((f) => f.child_id === selectedChildId);
recentFeedings = recentFeedings.filter(
(f) => f.child_id === selectedChildId,
);
}
const typeCounts = {
@@ -698,7 +602,9 @@
// Filter by selected child if applicable
if (selectedChildId !== null) {
completedFeedings = completedFeedings.filter((f) => f.child_id === selectedChildId);
completedFeedings = completedFeedings.filter(
(f) => f.child_id === selectedChildId,
);
}
// Calculate durations in minutes
@@ -711,14 +617,14 @@
// Find max duration to determine how many bins we need
const maxDuration = Math.max(...durations, 0);
const maxBin = Math.ceil(maxDuration / 5) * 5; // Round up to nearest 5
// Create 5-minute duration buckets dynamically
const buckets = {};
for (let i = 0; i < maxBin; i += 5) {
const label = `${i}-${i + 5}`;
buckets[label] = 0;
}
// Add a final bucket for anything over the max
if (maxBin > 0) {
buckets[`${maxBin}+`] = 0;
@@ -728,7 +634,7 @@
durations.forEach((duration) => {
const binIndex = Math.floor(duration / 5) * 5;
const label = `${binIndex}-${binIndex + 5}`;
if (buckets[label] !== undefined) {
buckets[label]++;
} else {
@@ -750,7 +656,9 @@
// Filter by selected child if applicable
let filteredFeedings = feedings;
if (selectedChildId !== null) {
filteredFeedings = feedings.filter((f) => f.child_id === selectedChildId);
filteredFeedings = feedings.filter(
(f) => f.child_id === selectedChildId,
);
}
// Create days based on currentDaysRange (including today)
@@ -782,7 +690,7 @@
function renderBarChart(chartData) {
const ctx = document.getElementById("feedingsChart").getContext("2d");
new Chart(ctx, {
type: "bar",
data: {
@@ -860,7 +768,7 @@
function renderPieChart(chartData) {
const ctx = document.getElementById("pieChart").getContext("2d");
// Color mapping for each type
const colorMap = {
"Left Breast": {
@@ -871,7 +779,7 @@
background: "rgba(118, 75, 162, 0.8)",
border: "rgba(118, 75, 162, 1)",
},
"Bottle": {
Bottle: {
background: "rgba(255, 159, 64, 0.8)",
border: "rgba(255, 159, 64, 1)",
},
@@ -879,12 +787,12 @@
// Generate colors based on labels present
const backgroundColors = chartData.labels.map(
(label) => colorMap[label]?.background || "rgba(200, 200, 200, 0.8)"
(label) => colorMap[label]?.background || "rgba(200, 200, 200, 0.8)",
);
const borderColors = chartData.labels.map(
(label) => colorMap[label]?.border || "rgba(200, 200, 200, 1)"
(label) => colorMap[label]?.border || "rgba(200, 200, 200, 1)",
);
new Chart(ctx, {
type: "pie",
data: {
@@ -923,8 +831,12 @@
callbacks: {
label: function (context) {
const count = context.parsed;
const total = context.dataset.data.reduce((a, b) => a + b, 0);
const percentage = total > 0 ? ((count / total) * 100).toFixed(1) : 0;
const total = context.dataset.data.reduce(
(a, b) => a + b,
0,
);
const percentage =
total > 0 ? ((count / total) * 100).toFixed(1) : 0;
return `${context.label}: ${count} (${percentage}%)`;
},
},
@@ -936,7 +848,7 @@
function renderDurationChart(chartData) {
const ctx = document.getElementById("durationChart").getContext("2d");
new Chart(ctx, {
type: "bar",
data: {
+261 -120
View File
@@ -4,6 +4,7 @@
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Baby Monitor</title>
<link rel="stylesheet" href="/menu.css" />
<style>
body {
font-family: Arial, sans-serif;
@@ -12,69 +13,6 @@
padding: 0 1rem;
background-color: #f0f0f0;
}
.burger-menu {
position: fixed;
top: 1rem;
left: 1rem;
cursor: pointer;
z-index: 1000;
background: white;
padding: 0.5rem;
border-radius: 4px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
}
.burger-menu div {
width: 25px;
height: 3px;
background-color: #333;
margin: 5px 0;
transition: 0.3s;
}
.menu-overlay {
position: fixed;
top: 0;
left: -250px;
width: 250px;
height: 100vh;
background: white;
box-shadow: 2px 0 10px rgba(0, 0, 0, 0.1);
transition: left 0.3s;
z-index: 999;
padding: 4rem 1rem 1rem 1rem;
}
.menu-overlay.open {
left: 0;
}
.menu-backdrop {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100vh;
background: rgba(0, 0, 0, 0.5);
display: none;
z-index: 998;
}
.menu-backdrop.open {
display: block;
}
.menu-item {
padding: 1rem;
border-bottom: 1px solid #eee;
cursor: pointer;
transition: background 0.2s;
}
.menu-item:hover {
background: #f5f5f5;
}
.menu-item.admin {
color: #667eea;
font-weight: 600;
}
.menu-item.logout {
color: #dc3545;
font-weight: 600;
}
.container {
background: white;
padding: 2rem;
@@ -85,11 +23,10 @@
color: #333;
margin-bottom: 1rem;
}
.user-info {
background: #e3f2fd;
padding: 1rem;
border-radius: 4px;
margin-bottom: 1rem;
.greeting {
color: #666;
font-size: 1.1rem;
margin-bottom: 2rem;
}
button {
padding: 0.75rem 1.5rem;
@@ -203,23 +140,36 @@
.cancel-button:hover {
background-color: #5a6268;
}
.sleep-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;
}
.sleep-button:hover {
transform: translateY(-2px);
box-shadow: 0 6px 20px rgba(102, 126, 234, 0.4);
background: linear-gradient(135deg, #764ba2 0%, #667eea 100%);
}
.sleep-button.active {
background: linear-gradient(135deg, #4facfe 0%, #00f2fe 100%);
}
.sleep-button.active:hover {
background: linear-gradient(135deg, #00f2fe 0%, #4facfe 100%);
}
.sleep-info {
font-size: 0.9rem;
margin-top: 0.5rem;
opacity: 0.9;
}
</style>
</head>
<body>
<div class="burger-menu" id="burgerMenu">
<div></div>
<div></div>
<div></div>
</div>
<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 logout" id="menuLogout">🚪 Logout</div>
</div>
<div class="container">
<div id="content" class="loading">
<p>Loading...</p>
@@ -260,41 +210,36 @@
</div>
</div>
<!-- Start Sleep Modal -->
<div class="modal" id="startSleepModal">
<div class="modal-content">
<h2>😴 Start Sleep</h2>
<form id="startSleepForm">
<div class="form-group">
<label for="modalSleepChildId">Child</label>
<select id="modalSleepChildId" required>
<option value="">Select a child</option>
</select>
</div>
<div class="modal-buttons">
<button
type="button"
class="cancel-button"
onclick="closeStartSleepModal()"
>
Cancel
</button>
<button type="submit">Start</button>
</div>
</form>
</div>
</div>
<script src="/menu.js"></script>
<script>
const token = localStorage.getItem("access_token");
const username = localStorage.getItem("username");
// Burger menu functionality
const burgerMenu = document.getElementById("burgerMenu");
const menuOverlay = document.getElementById("menuOverlay");
const menuBackdrop = document.getElementById("menuBackdrop");
function toggleMenu() {
menuOverlay.classList.toggle("open");
menuBackdrop.classList.toggle("open");
}
function closeMenu() {
menuOverlay.classList.remove("open");
menuBackdrop.classList.remove("open");
}
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("menuLogout").addEventListener("click", () => {
closeMenu();
logout();
});
// Check if user is logged in
if (!token) {
window.location.href = "/login.html";
@@ -317,6 +262,11 @@
}
})
.then((user) => {
// Initialize burger menu
initBurgerMenu({
includeHome: false,
});
// Check if user has any children
return fetch("/api/children", {
headers: {
@@ -344,6 +294,9 @@
let userChildren = [];
let lastFeeding = null;
let updateTimerInterval = null;
let activeSleep = null;
let lastSleep = null;
let sleepUpdateTimerInterval = null;
async function loadFeedingStatus(children) {
userChildren = children;
@@ -374,12 +327,38 @@
lastFeeding = feedings[0];
}
}
// Fetch active sleep
const activeSleepResponse = await fetch("/api/sleep/active", {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (activeSleepResponse.ok) {
activeSleep = await activeSleepResponse.json();
}
// Fetch all sleep logs to get the last one
const sleepResponse = await fetch("/api/sleep", {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (sleepResponse.ok) {
const sleeps = await sleepResponse.json();
if (sleeps.length > 0) {
lastSleep = sleeps[0];
}
}
} catch (error) {
console.error("Error loading feeding status:", error);
}
renderContent();
startUpdateTimer();
startSleepUpdateTimer();
}
function startUpdateTimer() {
@@ -401,6 +380,25 @@
}
}
function startSleepUpdateTimer() {
// Clear any existing timer
if (sleepUpdateTimerInterval) {
clearInterval(sleepUpdateTimerInterval);
}
// Update every 30 seconds if there's an active sleep
if (activeSleep) {
sleepUpdateTimerInterval = setInterval(() => {
if (activeSleep) {
updateSleepTimeDisplay();
} else {
clearInterval(sleepUpdateTimerInterval);
sleepUpdateTimerInterval = null;
}
}, 30000); // Update every 30 seconds
}
}
function updateFeedingTimeDisplay() {
const timeElement = document.getElementById("feedingTimeInfo");
if (timeElement && activeFeeding) {
@@ -408,11 +406,18 @@
}
}
function updateSleepTimeDisplay() {
const timeElement = document.getElementById("sleepTimeInfo");
if (timeElement && activeSleep) {
timeElement.textContent = formatTime(activeSleep.start_time);
}
}
function renderContent() {
const feedingButtonHtml = activeFeeding
? `
<button class="feeding-button active" onclick="stopFeeding()">
🛑 Stop Feeding
🛑 Stopped Feeding
<div class="feeding-info">
${activeFeeding.child_name || "Child"} - ${formatFeedingType(activeFeeding.feeding_type)}<br>
Started <span id="feedingTimeInfo">${formatTime(activeFeeding.start_time)}</span>
@@ -421,17 +426,34 @@
`
: `
<button class="feeding-button" onclick="showStartFeedingModal()">
▶️ Start Feeding
🍼 Started Feeding
</button>
`;
const sleepButtonHtml = activeSleep
? `
<button class="sleep-button active" onclick="stopSleep()">
🛑 Stopped Sleeping
<div class="sleep-info">
${activeSleep.child_name || "Child"}<br>
Started <span id="sleepTimeInfo">${formatTime(activeSleep.start_time)}</span>
</div>
</button>
`
: `
<button class="sleep-button" onclick="showStartSleepModal()">
😴 Started Sleeping
</button>
`;
document.getElementById("content").innerHTML = `
<h1>Welcome to Baby Monitor!</h1>
<div class="user-info">
<p><strong>Logged in as:</strong> ${username}</p>
</div>
<h1>Hi ${username}</h1>
<p class="greeting">Let's keep track of your baby's care.</p>
<button class="feeding-button" onclick="window.location.href='/log-diaper.html'" style="background: linear-gradient(135deg, #f093fb 0%, #f5576c 100%); margin-bottom: 20px;">
🧷 Changed Diaper
</button>
${feedingButtonHtml}
<p>Your session is active.</p>
${sleepButtonHtml}
`;
}
@@ -583,6 +605,125 @@
}
}
function showStartSleepModal() {
const modal = document.getElementById("startSleepModal");
const childSelect = document.getElementById("modalSleepChildId");
// 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 default based on last sleep
if (lastSleep) {
childSelect.value = lastSleep.child_id;
}
modal.classList.add("show");
}
function closeStartSleepModal() {
const modal = document.getElementById("startSleepModal");
modal.classList.remove("show");
document.getElementById("startSleepForm").reset();
}
document
.getElementById("startSleepForm")
.addEventListener("submit", async (e) => {
e.preventDefault();
const childId = parseInt(
document.getElementById("modalSleepChildId").value,
);
try {
const now = new Date();
const localDateTime = new Date(
now.getTime() - now.getTimezoneOffset() * 60000,
)
.toISOString()
.slice(0, 19);
const response = await fetch("/api/sleep", {
method: "POST",
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${token}`,
},
body: JSON.stringify({
child_id: childId,
start_time: localDateTime,
}),
});
if (response.ok) {
const sleep = await response.json();
activeSleep = sleep;
lastSleep = sleep;
// Add child name to active sleep
const child = userChildren.find((c) => c.id === childId);
if (child) {
activeSleep.child_name = child.name;
}
closeStartSleepModal();
renderContent();
startSleepUpdateTimer();
} else {
const data = await response.json();
alert(data.detail || "Failed to start sleep");
}
} catch (error) {
console.error("Error starting sleep:", error);
alert("Network error. Please try again.");
}
});
async function stopSleep() {
if (!activeSleep) return;
try {
const now = new Date();
const localDateTime = new Date(
now.getTime() - now.getTimezoneOffset() * 60000,
)
.toISOString()
.slice(0, 19);
const response = await fetch(`/api/sleep/${activeSleep.id}`, {
method: "PUT",
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${token}`,
},
body: JSON.stringify({
end_time: localDateTime,
}),
});
if (response.ok) {
activeSleep = null;
if (sleepUpdateTimerInterval) {
clearInterval(sleepUpdateTimerInterval);
sleepUpdateTimerInterval = null;
}
renderContent();
} else {
const data = await response.json();
alert(data.detail || "Failed to stop sleep");
}
} catch (error) {
console.error("Error stopping sleep:", error);
alert("Network error. Please try again.");
}
}
async function logout() {
const token = localStorage.getItem("access_token");
+467
View File
@@ -0,0 +1,467 @@
<!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>
+24 -14
View File
@@ -231,7 +231,8 @@
// Update title and button text if editing
if (isEditMode) {
document.querySelector("h1").textContent = "🍼 Edit Feeding";
document.querySelector(".subtitle").textContent = "Update feeding session details";
document.querySelector(".subtitle").textContent =
"Update feeding session details";
submitBtn.textContent = "Update Feeding";
}
@@ -292,25 +293,29 @@
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);
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);
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");
@@ -336,9 +341,11 @@
messageDiv.classList.remove("show");
try {
const url = isEditMode ? `/api/feedings/${feedingId}` : "/api/feedings";
const url = isEditMode
? `/api/feedings/${feedingId}`
: "/api/feedings";
const method = isEditMode ? "PUT" : "POST";
const response = await fetch(url, {
method: method,
headers: {
@@ -357,8 +364,10 @@
if (response.ok) {
showMessage(
isEditMode ? "Feeding updated successfully!" : "Feeding logged successfully!",
"success"
isEditMode
? "Feeding updated successfully!"
: "Feeding logged successfully!",
"success",
);
// Redirect to feedings page after 1 second
setTimeout(() => {
@@ -366,7 +375,8 @@
}, 1000);
} else {
showMessage(
data.detail || `Failed to ${isEditMode ? 'update' : 'log'} feeding. Please try again.`,
data.detail ||
`Failed to ${isEditMode ? "update" : "log"} feeding. Please try again.`,
"error",
);
}
+73
View File
@@ -0,0 +1,73 @@
/* Burger Menu Styles */
.burger-menu {
position: fixed;
top: 1rem;
left: 1rem;
cursor: pointer;
z-index: 1000;
background: white;
padding: 0.5rem;
border-radius: 4px;
box-shadow: 0 2px 5px rgba(0, 0, 0, 0.1);
}
.burger-menu div {
width: 25px;
height: 3px;
background-color: #333;
margin: 5px 0;
transition: 0.3s;
}
.menu-backdrop {
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100vh;
background: rgba(0, 0, 0, 0.5);
display: none;
z-index: 998;
}
.menu-backdrop.open {
display: block;
}
.menu-overlay {
position: fixed;
top: 0;
left: -250px;
width: 250px;
height: 100vh;
background: white;
box-shadow: 2px 0 10px rgba(0, 0, 0, 0.1);
transition: left 0.3s;
z-index: 999;
padding: 4rem 1rem 1rem 1rem;
}
.menu-overlay.open {
left: 0;
}
.menu-item {
padding: 1rem;
border-bottom: 1px solid #eee;
cursor: pointer;
transition: background 0.2s;
}
.menu-item:hover {
background: #f5f5f5;
}
.menu-item.admin {
color: #667eea;
font-weight: 600;
}
.menu-item.logout {
color: #dc3545;
font-weight: 600;
}
+110
View File
@@ -0,0 +1,110 @@
/**
* Initializes the burger menu navigation
* @param {Object} options - Configuration options
* @param {boolean} options.includeHome - Whether to include Home menu item
* @param {boolean} options.includeFeedings - Whether to include Feedings menu item
* @param {boolean} options.includeDiapers - Whether to include Diapers menu item
* @param {boolean} options.includeSleep - Whether to include Sleep menu item
* @param {boolean} options.includeSettings - Whether to include Settings menu item
*/
function initBurgerMenu(options = {}) {
const {
includeHome = true,
includeFeedings = true,
includeDiapers = true,
includeSleep = true,
includeSettings = true,
} = options;
// Create burger menu HTML
const burgerMenuHTML = `
<div class="burger-menu" id="burgerMenu">
<div></div>
<div></div>
<div></div>
</div>
<div class="menu-backdrop" id="menuBackdrop"></div>
<div class="menu-overlay" id="menuOverlay">
${includeHome ? '<div class="menu-item" id="menuHome">🏠 Home</div>' : ""}
${includeDiapers ? '<div class="menu-item" id="menuDiapers">🧷 Diapers</div>' : ""}
${includeFeedings ? '<div class="menu-item" id="menuFeedings">🍼 Feedings</div>' : ""}
${includeSleep ? '<div class="menu-item" id="menuSleep">😴 Sleep</div>' : ""}
${includeSettings ? '<div class="menu-item" id="menuSettings">⚙️ Settings</div>' : ""}
<div class="menu-item logout" id="menuLogout">🚪 Logout</div>
</div>
`;
// Insert menu at the beginning of body
document.body.insertAdjacentHTML("afterbegin", burgerMenuHTML);
// Get elements
const burgerMenu = document.getElementById("burgerMenu");
const menuOverlay = document.getElementById("menuOverlay");
const menuBackdrop = document.getElementById("menuBackdrop");
// Toggle menu function
function toggleMenu() {
menuOverlay.classList.toggle("open");
menuBackdrop.classList.toggle("open");
}
// Close menu function
function closeMenu() {
menuOverlay.classList.remove("open");
menuBackdrop.classList.remove("open");
}
// Event listeners for menu toggle
burgerMenu.addEventListener("click", toggleMenu);
menuBackdrop.addEventListener("click", closeMenu);
// Navigation event listeners
if (includeHome) {
document.getElementById("menuHome")?.addEventListener("click", () => {
window.location.href = "/";
});
}
if (includeFeedings) {
document.getElementById("menuFeedings")?.addEventListener("click", () => {
window.location.href = "/feedings.html";
});
}
if (includeDiapers) {
document.getElementById("menuDiapers")?.addEventListener("click", () => {
window.location.href = "/diapers.html";
});
}
if (includeSleep) {
document.getElementById("menuSleep")?.addEventListener("click", () => {
window.location.href = "/sleep.html";
});
}
if (includeSettings) {
document.getElementById("menuSettings")?.addEventListener("click", () => {
window.location.href = "/settings.html";
});
}
document.getElementById("menuLogout").addEventListener("click", () => {
closeMenu();
// Call the page's logout function if it exists, otherwise use default
if (typeof logout === "function") {
logout();
} else {
defaultLogout();
}
});
// Default logout function
function defaultLogout() {
localStorage.removeItem("access_token");
localStorage.removeItem("username");
window.location.href = "/login.html";
}
}
+845
View File
@@ -0,0 +1,845 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Settings - Baby Monitor</title>
<link rel="stylesheet" href="/menu.css" />
<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;
padding: 20px;
}
.container {
background: white;
border-radius: 12px;
box-shadow: 0 10px 40px rgba(0, 0, 0, 0.2);
padding: 40px;
max-width: 800px;
margin: 0 auto;
}
h1 {
color: #333;
margin-bottom: 10px;
font-size: 28px;
}
.subtitle {
color: #666;
margin-bottom: 30px;
font-size: 14px;
}
.section {
margin-bottom: 40px;
padding: 20px;
background: #f8f9fa;
border-radius: 8px;
}
.section h2 {
color: #333;
font-size: 20px;
margin-bottom: 20px;
display: flex;
align-items: center;
gap: 10px;
}
.form-group {
margin-bottom: 20px;
}
.form-group label {
display: block;
margin-bottom: 8px;
color: #333;
font-weight: 600;
font-size: 14px;
}
.form-group input {
width: 100%;
padding: 12px;
border: 2px solid #e0e0e0;
border-radius: 6px;
font-size: 14px;
transition: border-color 0.2s;
}
.form-group input:focus {
outline: none;
border-color: #667eea;
}
.form-group input:disabled {
background-color: #f5f5f5;
cursor: not-allowed;
}
.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;
text-decoration: none;
display: inline-block;
}
.button:hover {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(102, 126, 234, 0.4);
}
.button:disabled {
opacity: 0.5;
cursor: not-allowed;
transform: none;
}
.button.secondary {
background: #6c757d;
}
.button.secondary:hover {
box-shadow: 0 4px 12px rgba(108, 117, 125, 0.4);
}
.button.success {
background: linear-gradient(135deg, #56ab2f 0%, #a8e063 100%);
}
.button.success:hover {
box-shadow: 0 4px 12px rgba(86, 171, 47, 0.4);
}
.children-list {
display: grid;
gap: 15px;
margin-top: 20px;
}
.child-card {
background: white;
padding: 20px;
border-radius: 8px;
box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1);
}
.child-card h3 {
color: #333;
margin-bottom: 10px;
font-size: 18px;
}
.child-info {
color: #666;
font-size: 14px;
margin-bottom: 15px;
}
.child-info p {
margin-bottom: 5px;
}
.child-actions {
display: flex;
gap: 10px;
}
.loading {
text-align: center;
padding: 40px;
color: #666;
}
.alert {
padding: 12px 20px;
border-radius: 6px;
margin-bottom: 20px;
font-size: 14px;
}
.alert-success {
background-color: #d4edda;
color: #155724;
border: 1px solid #c3e6cb;
}
.alert-error {
background-color: #f8d7da;
color: #721c24;
border: 1px solid #f5c6cb;
}
.hidden {
display: none;
}
.quick-action {
display: block;
width: 100%;
padding: 15px;
margin-bottom: 15px;
background: white;
border: 2px solid #667eea;
color: #667eea;
border-radius: 8px;
font-size: 16px;
font-weight: 600;
cursor: pointer;
transition: all 0.2s;
text-align: left;
}
.quick-action:hover {
background: #667eea;
color: white;
transform: translateX(5px);
}
</style>
</head>
<body>
<div class="container">
<h1>⚙️ Settings</h1>
<p class="subtitle">Manage your account and children</p>
<div id="alert" class="hidden"></div>
<div class="section">
<h2>👤 Account Information</h2>
<div class="form-group">
<label for="username">Username</label>
<input type="text" id="username" disabled />
</div>
</div>
<div class="section">
<h2>🔑 Change Password</h2>
<form id="userForm">
<div class="form-group">
<label for="currentPassword">Current Password</label>
<input type="password" id="currentPassword" />
</div>
<div class="form-group">
<label for="newPassword">New Password</label>
<input type="password" id="newPassword" />
</div>
<div class="form-group">
<label for="confirmPassword">Confirm New Password</label>
<input type="password" id="confirmPassword" />
</div>
<button type="submit" class="button" id="saveUserBtn">
💾 Save Changes
</button>
</form>
<div
style="
margin-top: 40px;
padding-top: 30px;
border-top: 2px solid #dc3545;
"
>
<h3 style="color: #dc3545; margin-bottom: 15px">⚠️ Danger Zone</h3>
<p style="color: #666; margin-bottom: 15px; font-size: 14px">
Deleting your account is permanent and cannot be undone. This will:
</p>
<ul
style="
color: #666;
margin-bottom: 20px;
margin-left: 20px;
font-size: 14px;
"
>
<li>Delete your account permanently</li>
<li>Delete all children that have no other parents</li>
<li>
Delete all logs (feedings, diaper changes, sleep) for orphaned
children
</li>
<li>
Remove you as a parent from shared children (they will remain for
other parents)
</li>
</ul>
<button
class="button"
style="
background: linear-gradient(135deg, #dc3545 0%, #c82333 100%);
"
onclick="confirmDeleteAccount()"
>
🗑️ Delete Account
</button>
</div>
</div>
<div class="section">
<h2>👶 Your Children</h2>
<button
class="quick-action"
onclick="window.location.href='/add-child.html'"
>
Add New Child
</button>
<button
class="quick-action"
onclick="showRedeemCodeModal()"
style="border-color: #56ab2f; color: #56ab2f"
>
🔗 Redeem Share Code
</button>
<div id="childrenContent" class="loading">
<p>Loading children...</p>
</div>
</div>
</div>
<!-- Redeem Code Modal -->
<div
class="modal"
id="redeemCodeModal"
style="
display: none;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.5);
z-index: 1000;
justify-content: center;
align-items: center;
"
>
<div
style="
background: white;
padding: 30px;
border-radius: 12px;
max-width: 400px;
width: 90%;
"
>
<h2 style="margin-top: 0">🔗 Redeem Share Code</h2>
<p style="color: #666; margin-bottom: 20px">
Enter the share code to get access to a child.
</p>
<form id="redeemCodeForm">
<div class="form-group">
<label for="shareCode">Share Code</label>
<input
type="text"
id="shareCode"
placeholder="Enter code"
required
style="
width: 100%;
padding: 12px;
border: 2px solid #e0e0e0;
border-radius: 6px;
font-size: 14px;
"
/>
</div>
<div style="display: flex; gap: 10px; margin-top: 20px">
<button
type="button"
class="button secondary"
onclick="closeRedeemCodeModal()"
style="flex: 1"
>
Cancel
</button>
<button type="submit" class="button success" style="flex: 1">
Redeem
</button>
</div>
</form>
</div>
</div>
<!-- Share Code Modal -->
<div
class="modal"
id="shareCodeModal"
style="
display: none;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.5);
z-index: 1000;
justify-content: center;
align-items: center;
"
>
<div
style="
background: white;
padding: 30px;
border-radius: 12px;
max-width: 400px;
width: 90%;
"
>
<h2 style="margin-top: 0">🔗 Share Code</h2>
<p style="color: #666; margin-bottom: 20px" id="shareCodeChildName"></p>
<div
style="
background: #f8f9fa;
padding: 20px;
border-radius: 8px;
margin-bottom: 20px;
"
>
<div
style="
display: flex;
align-items: center;
justify-content: space-between;
"
>
<span
style="
font-size: 24px;
font-weight: bold;
color: #333;
letter-spacing: 2px;
"
id="shareCodeValue"
></span>
<button
onclick="copyShareCode()"
style="
background: #667eea;
color: white;
border: none;
padding: 10px 15px;
border-radius: 6px;
cursor: pointer;
font-size: 14px;
"
>
📋 Copy
</button>
</div>
</div>
<p style="color: #666; font-size: 14px; margin-bottom: 20px">
Share this code with another user. They can use it in Settings >
Redeem Share Code to get access to this child.
<br /><br />
This code expires in 7 days.
</p>
<button
type="button"
class="button"
onclick="closeShareCodeModal()"
style="width: 100%"
>
Close
</button>
</div>
</div>
<script src="/menu.js"></script>
<script>
const token = localStorage.getItem("access_token");
if (!token) {
window.location.href = "/login.html";
}
// Initialize burger menu
initBurgerMenu({ includeHome: true });
let currentUser = null;
let children = [];
// Load user data and children
async function loadData() {
try {
// Fetch user info
const userResponse = await fetch("/api/me", {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (userResponse.ok) {
currentUser = await userResponse.json();
document.getElementById("username").value = currentUser.username;
} else {
window.location.href = "/login.html";
return;
}
// Fetch children
const childrenResponse = await fetch("/api/children", {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (childrenResponse.ok) {
children = await childrenResponse.json();
displayChildren();
} else {
showAlert("Failed to load children", "error");
}
} catch (error) {
console.error("Error loading data:", error);
showAlert("Network error. Please try again.", "error");
}
}
function displayChildren() {
const container = document.getElementById("childrenContent");
if (children.length === 0) {
container.innerHTML = `
<p style="color: #666; text-align: center; padding: 20px;">
No children added yet. Click "Add New Child" to get started.
</p>
`;
return;
}
container.innerHTML = `
<div class="children-list">
${children
.map(
(child) => `
<div class="child-card">
<h3>👶 ${child.name}</h3>
<div class="child-info">
<p><strong>Birth Date:</strong> ${formatDate(child.birth_time)}</p>
<p><strong>Birth Weight:</strong> ${child.birth_weight}g</p>
<p><strong>Added:</strong> ${formatDate(child.created_at)}</p>
</div>
<div class="child-actions">
<button class="button secondary" onclick="editChild(${child.id})">
✏️ Edit
</button>
<button class="button success" onclick="shareChild(${child.id})">
🔗 Share
</button>
</div>
</div>
`,
)
.join("")}
</div>
`;
}
function formatDate(dateString) {
const date = new Date(dateString);
return date.toLocaleDateString("en-US", {
year: "numeric",
month: "long",
day: "numeric",
});
}
function editChild(childId) {
// Redirect to a child edit page or show a modal
// For now, just show an alert
const child = children.find((c) => c.id === childId);
if (child) {
alert(`Edit functionality for ${child.name} coming soon!`);
}
}
async function shareChild(childId) {
const child = children.find((c) => c.id === childId);
if (!child) return;
try {
const response = await fetch("/api/children/invitations", {
method: "POST",
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${token}`,
},
body: JSON.stringify({
child_id: childId,
}),
});
if (!response.ok) {
throw new Error("Failed to create invitation");
}
const invitation = await response.json();
// Show the share code modal
document.getElementById("shareCodeChildName").textContent =
`Share code for ${child.name}`;
document.getElementById("shareCodeValue").textContent =
invitation.code;
window.currentShareCode = invitation.code; // Store for copy function
document.getElementById("shareCodeModal").style.display = "flex";
} catch (error) {
console.error("Error creating share code:", error);
showAlert("Failed to create share code. Please try again.", "error");
}
}
function closeShareCodeModal() {
document.getElementById("shareCodeModal").style.display = "none";
window.currentShareCode = null;
}
function copyShareCode() {
const code = window.currentShareCode;
if (!code) return;
if (navigator.clipboard) {
navigator.clipboard
.writeText(code)
.then(() => {
showAlert("Share code copied to clipboard!", "success");
})
.catch((err) => {
console.error("Failed to copy to clipboard:", err);
showAlert(
"Failed to copy. Please copy the code manually.",
"error",
);
});
} else {
// Fallback for older browsers
const textArea = document.createElement("textarea");
textArea.value = code;
textArea.style.position = "fixed";
textArea.style.left = "-999999px";
document.body.appendChild(textArea);
textArea.select();
try {
document.execCommand("copy");
showAlert("Share code copied to clipboard!", "success");
} catch (err) {
showAlert(
"Failed to copy. Please copy the code manually.",
"error",
);
}
document.body.removeChild(textArea);
}
}
function showRedeemCodeModal() {
document.getElementById("redeemCodeModal").style.display = "flex";
}
function closeRedeemCodeModal() {
document.getElementById("redeemCodeModal").style.display = "none";
document.getElementById("redeemCodeForm").reset();
}
document
.getElementById("redeemCodeForm")
.addEventListener("submit", async (e) => {
e.preventDefault();
const code = document.getElementById("shareCode").value.trim();
try {
const response = await fetch("/api/children/invitations/redeem", {
method: "POST",
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${token}`,
},
body: JSON.stringify({ code }),
});
if (!response.ok) {
const error = await response.json();
// Show the specific error message from the backend in a popup
alert(error.detail || "Failed to redeem code");
return;
}
const result = await response.json();
alert(result.message);
closeRedeemCodeModal();
// Reload children list
await loadData();
} catch (error) {
console.error("Error redeeming code:", error);
// Display the actual error message in a popup
alert(error.message);
}
});
async function confirmDeleteAccount() {
const confirmed = confirm(
"⚠️ WARNING: This action cannot be undone!\n\n" +
"Are you absolutely sure you want to delete your account?\n\n" +
"This will:\n" +
"• Delete your account permanently\n" +
"• Delete all children that have no other parents\n" +
"• Delete ALL logs for orphaned children\n" +
"• Remove you as a parent from shared children\n\n" +
'Type "DELETE" in the next prompt to confirm.',
);
if (!confirmed) {
return;
}
const confirmText = prompt("Type DELETE to confirm account deletion:");
if (confirmText !== "DELETE") {
showAlert(
"Account deletion cancelled. You must type DELETE exactly.",
"info",
);
return;
}
try {
const response = await fetch("/api/account", {
method: "DELETE",
headers: {
Authorization: `Bearer ${localStorage.getItem("token")}`,
},
});
if (!response.ok) {
throw new Error("Failed to delete account");
}
const result = await response.json();
// Show deletion summary
let message = "✅ Account deleted successfully!\n\n";
if (result.deleted_children && result.deleted_children.length > 0) {
message += `Deleted children: ${result.deleted_children.join(", ")}\n`;
}
if (result.deleted_logs) {
message += `\nDeleted logs:\n`;
message += `• Feedings: ${result.deleted_logs.feedings}\n`;
message += `• Diaper Changes: ${result.deleted_logs.diaper_changes}\n`;
message += `• Sleep Sessions: ${result.deleted_logs.sleep_sessions}`;
}
alert(message);
// Logout and redirect
localStorage.removeItem("token");
window.location.href = "/login.html";
} catch (error) {
console.error("Error deleting account:", error);
showAlert("Failed to delete account. Please try again.", "error");
}
}
function showAlert(message, type) {
const alert = document.getElementById("alert");
alert.className = `alert alert-${type}`;
alert.textContent = message;
alert.classList.remove("hidden");
setTimeout(() => {
alert.classList.add("hidden");
}, 5000);
}
// Handle user form submission
document
.getElementById("userForm")
.addEventListener("submit", async (e) => {
e.preventDefault();
const currentPassword =
document.getElementById("currentPassword").value;
const newPassword = document.getElementById("newPassword").value;
const confirmPassword =
document.getElementById("confirmPassword").value;
// Validate passwords
if (newPassword && newPassword !== confirmPassword) {
alert("New passwords do not match");
return;
}
if (newPassword && !currentPassword) {
alert("Current password is required to change password");
return;
}
// If no password change requested, just show success
if (!newPassword) {
alert("No changes to save");
return;
}
const saveBtn = document.getElementById("saveUserBtn");
saveBtn.disabled = true;
saveBtn.textContent = "Saving...";
try {
const response = await fetch("/api/change-password", {
method: "POST",
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${token}`,
},
body: JSON.stringify({
current_password: currentPassword,
new_password: newPassword,
}),
});
if (!response.ok) {
const error = await response.json();
throw new Error(error.detail || "Failed to change password");
}
const result = await response.json();
alert(result.message);
// Clear form
document.getElementById("userForm").reset();
} catch (error) {
console.error("Error updating password:", error);
alert(error.message || "Failed to update password");
} finally {
saveBtn.disabled = false;
saveBtn.textContent = "💾 Save Changes";
}
});
// Load data on page load
loadData();
</script>
</body>
</html>
+804
View File
@@ -0,0 +1,804 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Sleep - Baby Monitor</title>
<link rel="stylesheet" href="/menu.css" />
<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, #4facfe 0%, #00f2fe 100%);
min-height: 100vh;
padding: 20px;
}
.container {
background: white;
border-radius: 12px;
box-shadow: 0 10px 40px rgba(0, 0, 0, 0.2);
padding: 40px;
max-width: 1000px;
margin: 0 auto;
}
h1 {
color: #333;
margin-bottom: 10px;
font-size: 28px;
}
.subtitle {
color: #666;
margin-bottom: 30px;
font-size: 14px;
}
.button {
background: linear-gradient(135deg, #4facfe 0%, #00f2fe 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;
text-decoration: none;
display: inline-block;
}
.button:hover {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(79, 172, 254, 0.4);
}
.button.secondary {
background: #6c757d;
margin-left: 10px;
}
.button.secondary:hover {
box-shadow: 0 4px 12px rgba(108, 117, 125, 0.4);
}
.loading {
text-align: center;
padding: 40px;
color: #666;
}
.empty-state {
text-align: center;
padding: 60px 20px;
color: #666;
}
.empty-state-icon {
font-size: 64px;
margin-bottom: 20px;
}
.empty-state h2 {
color: #333;
margin-bottom: 10px;
}
.empty-state p {
margin-bottom: 30px;
}
.chart-container {
margin-bottom: 40px;
padding: 20px;
background: #f8f9fa;
border-radius: 8px;
}
.chart-container h2 {
color: #333;
margin-bottom: 20px;
font-size: 20px;
}
.chart-wrapper {
position: relative;
height: 300px;
}
.charts-row {
display: grid;
grid-template-columns: 1fr 1fr;
gap: 20px;
margin-bottom: 40px;
}
@media (max-width: 768px) {
.charts-row {
grid-template-columns: 1fr;
}
}
.stats-grid {
display: grid;
grid-template-columns: repeat(auto-fit, minmax(200px, 1fr));
gap: 20px;
margin-bottom: 40px;
}
.stat-card {
background: #f8f9fa;
padding: 20px;
border-radius: 8px;
text-align: center;
}
.stat-card h3 {
color: #666;
font-size: 14px;
font-weight: 600;
text-transform: uppercase;
margin-bottom: 10px;
}
.stat-card .value {
color: #4facfe;
font-size: 32px;
font-weight: 700;
}
.list-container {
background: #f8f9fa;
border-radius: 8px;
padding: 20px;
}
.list-container h2 {
color: #333;
margin-bottom: 20px;
font-size: 20px;
}
.sleep-list {
max-height: 500px;
overflow-y: auto;
}
.sleep-item {
background: white;
padding: 16px;
border-radius: 6px;
margin-bottom: 12px;
display: flex;
justify-content: space-between;
align-items: center;
box-shadow: 0 2px 4px rgba(0, 0, 0, 0.05);
}
.sleep-item:last-child {
margin-bottom: 0;
}
.sleep-info {
flex: 1;
}
.sleep-child {
font-weight: 600;
color: #333;
margin-bottom: 4px;
}
.sleep-time {
color: #666;
font-size: 14px;
margin-bottom: 4px;
}
.sleep-duration {
color: #4facfe;
font-size: 14px;
font-weight: 600;
}
.sleep-actions {
display: flex;
gap: 8px;
}
.edit-button {
background: #4facfe;
color: white;
border: none;
padding: 8px 16px;
border-radius: 4px;
font-size: 14px;
cursor: pointer;
transition: background 0.2s;
}
.edit-button:hover {
background: #3a9be8;
}
.filters {
display: flex;
gap: 15px;
margin-bottom: 30px;
flex-wrap: wrap;
align-items: center;
}
.filter-group {
display: flex;
flex-direction: column;
gap: 5px;
}
.filter-group label {
color: #666;
font-size: 14px;
font-weight: 600;
}
.filter-group select {
padding: 8px 12px;
border: 1px solid #ddd;
border-radius: 4px;
font-size: 14px;
background: white;
cursor: pointer;
}
.badge {
display: inline-block;
padding: 4px 8px;
border-radius: 4px;
font-size: 12px;
font-weight: 600;
margin-right: 8px;
}
.badge.ongoing {
background: #4facfe;
color: white;
}
</style>
</head>
<body>
<div class="container">
<h1>😴 Sleep Tracking</h1>
<p class="subtitle">Monitor your baby's sleep patterns</p>
<div class="filters">
<div class="filter-group">
<label for="childFilter">Child</label>
<select id="childFilter">
<option value="">All Children</option>
</select>
</div>
<div class="filter-group">
<label for="timeRangeFilter">Time Range</label>
<select id="timeRangeFilter">
<option value="1">Last 24 hours</option>
<option value="3">Last 3 days</option>
<option value="7" selected>Last 7 days</option>
<option value="14">Last 14 days</option>
<option value="30">Last 30 days</option>
<option value="90">Last 90 days</option>
</select>
</div>
</div>
<div id="content" class="loading">
<p>Loading sleep data...</p>
</div>
</div>
<script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/chart.umd.min.js"></script>
<script src="/menu.js"></script>
<script>
const token = localStorage.getItem("access_token");
// Check if user is logged in
if (!token) {
window.location.href = "/login.html";
}
// Initialize burger menu
initBurgerMenu({ includeHome: true });
let allSleeps = [];
let allChildren = [];
let selectedChildId = "";
// Filter change handlers
document
.getElementById("childFilter")
.addEventListener("change", function () {
selectedChildId = this.value;
// Save selection to localStorage
if (selectedChildId) {
localStorage.setItem("lastSleepChildFilter", selectedChildId);
} else {
localStorage.removeItem("lastSleepChildFilter");
}
renderCharts();
});
document
.getElementById("timeRangeFilter")
.addEventListener("change", function () {
loadData();
});
async function loadData() {
try {
// Fetch children
const childrenResponse = await fetch("/api/children", {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (!childrenResponse.ok) {
throw new Error("Failed to fetch children");
}
allChildren = await childrenResponse.json();
// Populate child filter
const childFilter = document.getElementById("childFilter");
childFilter.innerHTML = '<option value="">All Children</option>';
allChildren.forEach((child) => {
const option = document.createElement("option");
option.value = child.id;
option.textContent = child.name;
childFilter.appendChild(option);
});
// Restore last selected child from localStorage
const lastChildId = localStorage.getItem("lastSleepChildFilter");
if (lastChildId) {
childFilter.value = lastChildId;
selectedChildId = lastChildId;
}
// Fetch sleep logs
const sleepResponse = await fetch("/api/sleep", {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (!sleepResponse.ok) {
throw new Error("Failed to fetch sleep data");
}
allSleeps = await sleepResponse.json();
renderCharts();
} catch (error) {
console.error("Error loading data:", error);
document.getElementById("content").innerHTML = `
<div class="empty-state">
<div class="empty-state-icon">😴</div>
<h2>Error Loading Data</h2>
<p>${error.message}</p>
<button class="button" onclick="window.location.href='/'">Go Home</button>
</div>
`;
}
}
function renderCharts() {
const timeRange = parseInt(
document.getElementById("timeRangeFilter").value,
);
const cutoffDate = new Date();
cutoffDate.setDate(cutoffDate.getDate() - timeRange);
// Filter sleeps by time range and child
let filteredSleeps = allSleeps.filter((sleep) => {
const sleepDate = new Date(sleep.start_time);
const matchesTimeRange = sleepDate >= cutoffDate;
const matchesChild =
!selectedChildId || sleep.child_id === parseInt(selectedChildId);
return matchesTimeRange && matchesChild;
});
if (filteredSleeps.length === 0) {
document.getElementById("content").innerHTML = `
<div class="empty-state">
<div class="empty-state-icon">😴</div>
<h2>No Sleep Data</h2>
<p>Start tracking sleep sessions from the home page.</p>
<button class="button" onclick="window.location.href='/'">Go Home</button>
</div>
`;
return;
}
// Calculate stats
const completedSleeps = filteredSleeps.filter(
(sleep) => sleep.end_time,
);
const totalSessions = filteredSleeps.length;
const ongoingSessions = filteredSleeps.filter(
(sleep) => !sleep.end_time,
).length;
let totalMinutes = 0;
let longestMinutes = 0;
let shortestMinutes = Infinity;
completedSleeps.forEach((sleep) => {
const duration = calculateDuration(sleep.start_time, sleep.end_time);
totalMinutes += duration;
if (duration > longestMinutes) longestMinutes = duration;
if (duration < shortestMinutes) shortestMinutes = duration;
});
const avgMinutes =
completedSleeps.length > 0
? Math.round(totalMinutes / completedSleeps.length)
: 0;
if (completedSleeps.length === 0) {
shortestMinutes = 0;
}
// Prepare data for charts
const barChartData = prepareBarChartData(filteredSleeps, timeRange);
const durationDistData =
prepareDurationDistributionData(completedSleeps);
let html = `
<div class="stats-grid">
<div class="stat-card">
<h3>Total Sessions</h3>
<div class="value">${totalSessions}</div>
</div>
<div class="stat-card">
<h3>Avg Duration</h3>
<div class="value">${formatDuration(avgMinutes)}</div>
</div>
<div class="stat-card">
<h3>Longest Sleep</h3>
<div class="value">${formatDuration(longestMinutes)}</div>
</div>
</div>
<div class="chart-container">
<h2>Sleep Sessions per Day</h2>
<div class="chart-wrapper">
<canvas id="barChart"></canvas>
</div>
</div>
<div class="charts-row">
<div class="chart-container">
<h2>Duration Distribution</h2>
<div class="chart-wrapper">
<canvas id="durationChart"></canvas>
</div>
</div>
<div class="chart-container">
<h2>Average Duration by Day</h2>
<div class="chart-wrapper">
<canvas id="avgDurationChart"></canvas>
</div>
</div>
</div>
<div class="list-container">
<h2>Recent Sleep Sessions</h2>
<div class="sleep-list">
${filteredSleeps
.slice(0, 50)
.map((sleep) => renderSleepItem(sleep))
.join("")}
</div>
</div>
`;
document.getElementById("content").innerHTML = html;
// Render charts
renderBarChart(barChartData);
renderDurationChart(durationDistData);
renderAvgDurationChart(filteredSleeps, timeRange);
}
function calculateDuration(startTime, endTime) {
if (!endTime) return 0;
const start = new Date(startTime);
const end = new Date(endTime);
return Math.round((end - start) / 60000); // minutes
}
function formatDuration(minutes) {
if (minutes === 0) return "0m";
const hours = Math.floor(minutes / 60);
const mins = minutes % 60;
if (hours === 0) return `${mins}m`;
if (mins === 0) return `${hours}h`;
return `${hours}h ${mins}m`;
}
function prepareBarChartData(sleeps, timeRange) {
const days = {};
const today = new Date();
today.setHours(0, 0, 0, 0);
// Initialize all days in range
for (let i = timeRange - 1; i >= 0; i--) {
const date = new Date(today);
date.setDate(date.getDate() - i);
const dateStr = date.toISOString().split("T")[0];
days[dateStr] = 0;
}
// Count sleeps per day
sleeps.forEach((sleep) => {
const date = new Date(sleep.start_time);
date.setHours(0, 0, 0, 0);
const dateStr = date.toISOString().split("T")[0];
if (days.hasOwnProperty(dateStr)) {
days[dateStr]++;
}
});
const labels = Object.keys(days).map((date) => {
const d = new Date(date);
return d.toLocaleDateString("en-US", {
month: "short",
day: "numeric",
});
});
return {
labels,
data: Object.values(days),
};
}
function prepareDurationDistributionData(sleeps) {
const ranges = {
"0-30m": 0,
"30m-1h": 0,
"1-2h": 0,
"2-3h": 0,
"3-4h": 0,
"4h+": 0,
};
sleeps.forEach((sleep) => {
const duration = calculateDuration(sleep.start_time, sleep.end_time);
if (duration < 30) ranges["0-30m"]++;
else if (duration < 60) ranges["30m-1h"]++;
else if (duration < 120) ranges["1-2h"]++;
else if (duration < 180) ranges["2-3h"]++;
else if (duration < 240) ranges["3-4h"]++;
else ranges["4h+"]++;
});
return {
labels: Object.keys(ranges),
data: Object.values(ranges),
};
}
function renderBarChart(chartData) {
const ctx = document.getElementById("barChart");
new Chart(ctx, {
type: "bar",
data: {
labels: chartData.labels,
datasets: [
{
label: "Sleep Sessions",
data: chartData.data,
backgroundColor: "rgba(79, 172, 254, 0.6)",
borderColor: "rgba(79, 172, 254, 1)",
borderWidth: 1,
},
],
},
options: {
responsive: true,
maintainAspectRatio: false,
scales: {
y: {
beginAtZero: true,
ticks: {
stepSize: 1,
},
},
},
plugins: {
legend: {
display: false,
},
},
},
});
}
function renderDurationChart(chartData) {
const ctx = document.getElementById("durationChart");
new Chart(ctx, {
type: "pie",
data: {
labels: chartData.labels,
datasets: [
{
data: chartData.data,
backgroundColor: [
"rgba(79, 172, 254, 0.8)",
"rgba(0, 242, 254, 0.8)",
"rgba(58, 155, 232, 0.8)",
"rgba(32, 137, 220, 0.8)",
"rgba(21, 119, 208, 0.8)",
"rgba(11, 101, 196, 0.8)",
],
},
],
},
options: {
responsive: true,
maintainAspectRatio: false,
plugins: {
legend: {
position: "bottom",
},
},
},
});
}
function renderAvgDurationChart(sleeps, timeRange) {
const days = {};
const today = new Date();
today.setHours(0, 0, 0, 0);
// Initialize all days
for (let i = timeRange - 1; i >= 0; i--) {
const date = new Date(today);
date.setDate(date.getDate() - i);
const dateStr = date.toISOString().split("T")[0];
days[dateStr] = { total: 0, count: 0 };
}
// Calculate totals
sleeps
.filter((sleep) => sleep.end_time)
.forEach((sleep) => {
const date = new Date(sleep.start_time);
date.setHours(0, 0, 0, 0);
const dateStr = date.toISOString().split("T")[0];
if (days.hasOwnProperty(dateStr)) {
const duration = calculateDuration(
sleep.start_time,
sleep.end_time,
);
days[dateStr].total += duration;
days[dateStr].count++;
}
});
const labels = Object.keys(days).map((date) => {
const d = new Date(date);
return d.toLocaleDateString("en-US", {
month: "short",
day: "numeric",
});
});
const data = Object.values(days).map((day) =>
day.count > 0 ? Math.round(day.total / day.count) : 0,
);
const ctx = document.getElementById("avgDurationChart");
new Chart(ctx, {
type: "line",
data: {
labels,
datasets: [
{
label: "Avg Duration (minutes)",
data,
borderColor: "rgba(79, 172, 254, 1)",
backgroundColor: "rgba(79, 172, 254, 0.1)",
fill: true,
tension: 0.4,
},
],
},
options: {
responsive: true,
maintainAspectRatio: false,
scales: {
y: {
beginAtZero: true,
ticks: {
callback: function (value) {
return value + "m";
},
},
},
},
plugins: {
legend: {
display: false,
},
},
},
});
}
function renderSleepItem(sleep) {
const child = allChildren.find((c) => c.id === sleep.child_id);
const childName = child ? child.name : "Unknown";
const startDate = new Date(sleep.start_time);
const isOngoing = !sleep.end_time;
let durationText = "";
if (isOngoing) {
durationText = '<span class="badge ongoing">Ongoing</span>';
} else {
const duration = calculateDuration(sleep.start_time, sleep.end_time);
durationText = `Duration: ${formatDuration(duration)}`;
}
return `
<div class="sleep-item">
<div class="sleep-info">
<div class="sleep-child">${childName}</div>
<div class="sleep-time">
${startDate.toLocaleString("en-US", {
month: "short",
day: "numeric",
hour: "numeric",
minute: "2-digit",
})}
${isOngoing ? "" : ` - ${new Date(sleep.end_time).toLocaleString("en-US", { hour: "numeric", minute: "2-digit" })}`}
</div>
<div class="sleep-duration">${durationText}</div>
</div>
</div>
`;
}
async function logout() {
try {
await fetch("/api/logout", {
method: "POST",
headers: {
Authorization: `Bearer ${token}`,
},
});
} catch (error) {
console.error("Logout error:", error);
} finally {
localStorage.removeItem("access_token");
localStorage.removeItem("username");
window.location.href = "/login.html";
}
}
// Load data on page load
loadData();
</script>
</body>
</html>
+26
View File
@@ -0,0 +1,26 @@
"""Access control utility functions for verifying resource ownership."""
from fastapi import HTTPException
from baby_monitor.repositories.child.sqlite_child import SQLiteChildRepository
def verify_child_access(
child_repo: SQLiteChildRepository, child_id: int, user_id: int
) -> None:
"""Verify that user has access to the child.
Args:
child_repo: Child repository instance
child_id: ID of the child to verify access for
user_id: ID of the user requesting access
Raises:
HTTPException: 404 if child not found, 403 if user is not a parent
"""
child = child_repo.get_by_id(child_id)
if not child:
raise HTTPException(status_code=404, detail="Child not found")
parent_ids = child_repo.get_parent_ids(child_id)
if user_id not in parent_ids:
raise HTTPException(status_code=403, detail="Access denied to this child")