Author SHA1 Message Date
Brian Bjarke Jensen 9e5e5b58c7 added env vars 2025-11-12 18:23:35 +01:00
Brian Bjarke Jensen 824358f846 CQ fixes
Build and Push Docker Image / build-and-push (pull_request) Successful in 58s
Python Code Quality / python-code-quality (pull_request) Successful in 11s
Python Test / python-test (pull_request) Successful in 18s
2025-11-12 18:18:17 +01:00
Brian Bjarke Jensen cb20abfb85 added showcase data, users and CI workflow to refresh data daily
Build and Push Docker Image / build-and-push (pull_request) Successful in 25s
Python Code Quality / python-code-quality (pull_request) Failing after 9s
Python Test / python-test (pull_request) Successful in 17s
2025-11-12 18:14:28 +01:00
brian ca1e74154f Merge pull request 'fixed redirect' (#32) from fix-edit-child-cancel-redirect into main
Build and Push Docker Image / build-and-push (push) Successful in 25s
Python Code Quality / python-code-quality (push) Successful in 10s
Python Test / python-test (push) Successful in 18s
Reviewed-on: #32
2025-11-12 17:34:41 +01:00
Brian Bjarke Jensen 4dd10240ce fixed redirect
Build and Push Docker Image / build-and-push (pull_request) Successful in 58s
Python Code Quality / python-code-quality (pull_request) Successful in 9s
Python Test / python-test (pull_request) Successful in 17s
2025-11-12 17:32:02 +01:00
brian 2a6d470a9a Merge pull request 'Added edit child functionality' (#31) from add-edit-child-functionality into main
Build and Push Docker Image / build-and-push (push) Successful in 25s
Python Code Quality / python-code-quality (push) Successful in 10s
Python Test / python-test (push) Successful in 18s
Reviewed-on: #31
2025-11-12 17:28:48 +01:00
Brian Bjarke Jensen 4898cce969 added functionality to edit child and show shared status directly
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-12 17:23:32 +01:00
brian c7ef7b6f1f Merge pull request 'Show who children are shared with' (#30) from show-who-children-are-shared-with into main
Build and Push Docker Image / build-and-push (push) Successful in 25s
Python Code Quality / python-code-quality (push) Successful in 10s
Python Test / python-test (push) Successful in 18s
Reviewed-on: #30
2025-11-12 17:08:30 +01:00
Brian Bjarke Jensen 80156c8909 CQ 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-12 17:01:40 +01:00
Brian Bjarke Jensen 05560d766a added shared parent info and edit child info modal 2025-11-12 17:01:06 +01:00
brian 1887de14e0 Merge pull request 'Improved single child UX' (#29) from improve-single-child-UX 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 18s
Reviewed-on: #29
2025-11-12 16:42:30 +01:00
Brian Bjarke Jensen 28a5df4f12 changed dropdown to read-only textfield when only 1 associated child and fixed redirects after manual entries
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-12 16:39:16 +01:00
brian 9d1ca55905 Merge pull request 'streamlined manual entry redirects back to related overview page' (#28) from ensure-manual-logs-go-back-to-overview-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 18s
Reviewed-on: #28
2025-11-12 15:58:31 +01:00
Brian Bjarke Jensen 5b8a19b2ad streamlined manual entry redirects back to related overview page
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-12 15:53:35 +01:00
brian 4f3bc36168 Merge pull request 'Support sliding login token expiration' (#27) from support-sliding-login-token-expiration into main
Build and Push Docker Image / build-and-push (push) Successful in 26s
Python Code Quality / python-code-quality (push) Successful in 10s
Python Test / python-test (push) Successful in 18s
Reviewed-on: #27
2025-11-12 15:43:01 +01:00
Brian Bjarke Jensen a302dc51c6 CQ fixes
Build and Push Docker Image / build-and-push (pull_request) Successful in 1m0s
Python Code Quality / python-code-quality (pull_request) Successful in 10s
Python Test / python-test (pull_request) Successful in 18s
2025-11-12 15:34:10 +01:00
Brian Bjarke Jensen d46fd51aa0 added reset of TTL for login tokens when user is active
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-12 15:31:06 +01:00
brian 6e402cb1df Merge pull request 'added support for manual sleep logging' (#26) from support-manually-adding-sleep-entries 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 18s
Reviewed-on: #26
2025-11-12 15:27:51 +01:00
Brian Bjarke Jensen 1e93fb8783 added support for manual sleep logging
Build and Push Docker Image / build-and-push (pull_request) Successful in 1m6s
Python Code Quality / python-code-quality (pull_request) Successful in 11s
Python Test / python-test (pull_request) Successful in 18s
2025-11-12 15:23:51 +01:00
brian 49242498e0 Merge pull request 'align-index-page' (#25) from align-index-page 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 26s
Reviewed-on: #25
2025-11-11 21:34:48 +01:00
Brian Bjarke Jensen 8c93e62bef reverted style changes
Build and Push Docker Image / build-and-push (pull_request) Successful in 59s
Python Code Quality / python-code-quality (pull_request) Successful in 11s
Python Test / python-test (pull_request) Successful in 18s
2025-11-11 21:33:01 +01:00
Brian Bjarke Jensen 0fa011de8d shortened start period 2025-11-11 21:18:20 +01:00
Brian Bjarke Jensen 1f752eed5f aligned styling 2025-11-11 21:01:25 +01:00
brian 36854927a6 Merge pull request 'add-postgres-support' (#24) from add-postgres-support into main
Build and Push Docker Image / build-and-push (push) Successful in 25s
Python Code Quality / python-code-quality (push) Successful in 10s
Python Test / python-test (push) Successful in 18s
Reviewed-on: #24
2025-11-11 20:48:01 +01:00
Brian Bjarke Jensen a2b78f7e96 code quality 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-11 20:43:47 +01:00
Brian Bjarke Jensen 696de14e6b removed data volume, as it is not needed when postgres is used
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 18s
2025-11-11 20:39:46 +01:00
Brian Bjarke Jensen e7ed89e04e implemented postgres support in repositories 2025-11-11 18:52:19 +01:00
Brian Bjarke Jensen 65655db034 added postgres support 2025-11-11 15:16:24 +01:00
brian 7c602c8da7 Merge pull request 'improve overview graphs' (#22) from 24-hour-graphs-should-show-individual-hours into main
Build and Push Docker Image / build-and-push (push) Successful in 25s
Python Code Quality / python-code-quality (push) Successful in 10s
Python Test / python-test (push) Successful in 17s
Reviewed-on: #22
2025-11-11 14:55:59 +01:00
Brian Bjarke Jensen 752aee1148 corrected filter placement and barchart title
Build and Push Docker Image / build-and-push (pull_request) Successful in 1m6s
Python Code Quality / python-code-quality (pull_request) Successful in 11s
Python Test / python-test (pull_request) Successful in 17s
2025-11-11 14:51:04 +01:00
Brian Bjarke Jensen 3285d496b4 changed barchart to stacked bars to show individual feeding durations 2025-11-11 14:50:50 +01:00
Brian Bjarke Jensen c745ab1b7a added skip add-child for new users to allow for adding a shared child 2025-11-11 14:39:59 +01:00
Brian Bjarke Jensen dea3b5d3b5 persisted selection of child and time range when switching between pages. Also added automatic total sleep time scaling on vertical axis 2025-11-11 14:29:43 +01:00
Brian Bjarke Jensen b1fae46f28 made stacked barchart to show individual sleep session lengths 2025-11-11 14:19:41 +01:00
Brian Bjarke Jensen 954e5a9f6f fixed bug with sleeping overview barchart 2025-11-11 13:58:04 +01:00
Brian Bjarke Jensen bb27d4437f changed overview graphs binning 2025-11-11 13:45:54 +01:00
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
brian 8fe3694e7a Merge pull request 'add-feeding-overview' (#12) from add-feeding-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: #12
2025-11-10 00:23:09 +01:00
Brian Bjarke Jensen 3582ba13e8 made example deployments for different environments
Build and Push Docker Image / build-and-push (pull_request) Successful in 25s
Python Code Quality / python-code-quality (pull_request) Successful in 10s
Python Test / python-test (pull_request) Successful in 17s
2025-11-10 00:21:19 +01:00
Brian Bjarke Jensen 44c6f0168f added feedings page with graphs and list of entries with option to edit and manually add new
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 17s
2025-11-09 21:23:09 +01:00
Brian Bjarke Jensen 8d5e2a99ef removed deprecated yaml field 2025-11-09 19:12:49 +01:00
brian af2c3ed264 Merge pull request 'added feeding data objects and workflow' (#10) from support-add-feeding-entry into main
Build and Push Docker Image / build-and-push (push) Successful in 25s
Python Code Quality / python-code-quality (push) Successful in 10s
Python Test / python-test (push) Successful in 17s
Reviewed-on: #10
2025-11-09 19:10:45 +01:00
Brian Bjarke Jensen 55de11dcdd added feeding data objects and workflow
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-09 17:22:37 +01:00
brian 1f48083db8 Merge pull request 'make-page-to-add-child' (#9) from make-page-to-add-child into main
Build and Push Docker Image / build-and-push (push) Successful in 26s
Python Code Quality / python-code-quality (push) Successful in 10s
Python Test / python-test (push) Successful in 17s
Reviewed-on: #9
2025-11-09 12:47:06 +01:00
Brian Bjarke Jensen 16e7153f5f added child endpoint, ability to add and edit child as well as auto redirect to add-child page when user without child accesses home page
Build and Push Docker Image / build-and-push (pull_request) Successful in 1m5s
Python Code Quality / python-code-quality (pull_request) Successful in 10s
Python Test / python-test (pull_request) Successful in 17s
2025-11-09 11:54:28 +01:00
Brian Bjarke Jensen 1950b600cf added clarifying comment 2025-11-09 11:19:03 +01:00
brian b883ef455b Merge pull request 'added password hashing and ensured admin user exists' (#8) from add-password-hashing into main
Build and Push Docker Image / build-and-push (push) Successful in 28s
Python Code Quality / python-code-quality (push) Successful in 10s
Python Test / python-test (push) Successful in 17s
Reviewed-on: #8
2025-11-08 00:04:43 +01:00
Brian Bjarke Jensen 19a211121c 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 17s
2025-11-07 23:56:38 +01:00
Brian Bjarke Jensen ef1c7f83b6 added admin credential env vars for testing 2025-11-07 23:56:15 +01:00
Brian Bjarke Jensen 7b4e597e6f added password hashing and ensured admin user exists
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) Failing after 24s
2025-11-07 23:48:14 +01:00
brian 8b187f134d Merge pull request 'support-adding-users' (#4) from support-adding-users into main
Build and Push Docker Image / build-and-push (push) Successful in 25s
Python Code Quality / python-code-quality (push) Successful in 10s
Python Test / python-test (push) Successful in 15s
Reviewed-on: #4
2025-11-07 23:14:38 +01:00
Brian Bjarke Jensen 2b956213aa ruff and prettier fixes
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 15s
2025-11-07 23:10:59 +01:00
Brian Bjarke Jensen 469fd722de mypy fixes 2025-11-07 23:10:25 +01:00
Brian Bjarke Jensen 9d9bab56ed removed admin link from burger menu 2025-11-07 23:05:40 +01:00
Brian Bjarke Jensen 43971a1eea added admin login redirect to admin dashboard 2025-11-07 23:04:21 +01:00
Brian Bjarke Jensen d31ebc8c22 added burger menu with admin page and user invitation link generation 2025-11-07 22:33:57 +01:00
Brian Bjarke Jensen b8e04fe816 corrected gitea instance links
Build and Push Docker Image / build-and-push (push) Successful in 56s
Python Code Quality / python-code-quality (push) Successful in 9s
Python Test / python-test (push) Successful in 14s
2025-11-06 23:41:51 +01:00
Brian Bjarke Jensen c2d272d7ac prettier fixes 2025-11-06 23:37:55 +01:00
Brian Bjarke Jensen f15e87a484 added prettier 2025-11-06 23:37:35 +01:00
Brian Bjarke Jensen 705a89e16e added readme
Build and Push Docker Image / build-and-push (push) Successful in 59s
Python Code Quality / python-code-quality (push) Successful in 10s
Python Test / python-test (push) Successful in 14s
2025-11-06 22:46:40 +01:00
79 changed files with 12027 additions and 159 deletions
@@ -0,0 +1,43 @@
name: Refresh Showcase Data
on:
schedule:
# Run daily at 3 AM UTC
- cron: "0 3 * * *"
workflow_dispatch: # Allow manual triggering
jobs:
refresh-data:
runs-on: ubuntu-latest
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: ${{ vars.PYTHON_VERSION }}
- name: Install uv
run: curl -LsSf https://astral.sh/uv/install.sh | sh
- name: Install dependencies
run: |
uv sync --no-dev --all-extras
- name: Run showcase data seeding script
env:
ADMIN_USERNAME: ${{ secrets.ADMIN_USERNAME }}
ADMIN_PASSWORD: ${{ secrets.ADMIN_PASSWORD }}
POSTGRES_URI: ${{ secrets.POSTGRES_URI }}
run: |
uv run python scripts/seed_showcase_data.py
- name: Notify on success
if: success()
run: echo "✅ Showcase data refreshed successfully"
- name: Notify on failure
if: failure()
run: echo "❌ Failed to refresh showcase data"
+3 -1
View File
@@ -23,7 +23,9 @@ COPY pyproject.toml README.md ./
COPY src/ ./src/ COPY src/ ./src/
# Install Python dependencies including all optional dependencies # Install Python dependencies including all optional dependencies
# This makes the image self-contained and ready for any configuration # This makes the image self-contained and ready for any configuration:
# - Redis support (redis extra)
# - PostgreSQL support (postgres extra)
RUN uv sync --no-dev --all-extras RUN uv sync --no-dev --all-extras
# Add virtual environment to PATH # Add virtual environment to PATH
+272 -2
View File
@@ -1,3 +1,273 @@
# baby-monitor # 👶 Baby Monitor
Baby monitor app that helps track feeding, sleeping and diaper changes for a child. A self-hosted FastAPI web application for tracking baby activities including feeding, sleeping, and diaper changes. Built with modern Python tools and designed for easy deployment with Docker.
[![Docker](https://img.shields.io/badge/docker-%230db7ed.svg?style=flat&logo=docker&logoColor=white)](https://www.docker.com/)
[![FastAPI](https://img.shields.io/badge/FastAPI-005571?style=flat&logo=fastapi)](https://fastapi.tiangolo.com)
[![Python](https://img.shields.io/badge/python-3.12+-blue.svg?style=flat&logo=python&logoColor=white)](https://www.python.org)
## ✨ Features
- 🔐 **Secure Authentication** - Token-based authentication with environment-configured credentials
- 💾 **Flexible Storage** - SQLite by default with PostgreSQL support
- 🚀 **Scalable Sessions** - In-memory tokens with optional Redis for distributed deployments
- 📦 **Self-Contained** - Docker image includes all optional dependencies
- 🔌 **Repository Pattern** - Clean architecture with swappable backends
- 🏥 **Health Checks** - Built-in health and readiness endpoints
- 🌐 **SPA Frontend** - Modern single-page application interface
- 🐳 **Docker Ready** - Production-ready Dockerfile with multi-architecture support
## 🚀 Quick Start
### Using Docker (Recommended)
```bash
# Pull and run the latest image
docker run -d \
--name baby-monitor \
-p 8000:8000 \
-e ADMIN_PASSWORD=your-secure-password \
-v baby_monitor_data:/data \
gitea.gt-proj.com/brian/baby-monitor:latest
# Access the application
open http://localhost:8000
```
### Using Docker Compose
```yaml
services:
baby-monitor:
image: gitea.gt-proj.com/brian/baby-monitor:latest
container_name: baby-monitor
ports:
- "8000:8000"
environment:
- ENVIRONMENT=production
- ADMIN_PASSWORD=${ADMIN_PASSWORD}
# Optional: Use Redis for distributed token storage
# - REDIS_URI=redis://redis:6379
volumes:
- ./data:/data
restart: unless-stopped
# Optional: Redis for token storage
# redis:
# image: redis:7-alpine
# restart: unless-stopped
```
### Local Development
```bash
# Clone the repository
git clone https://gitea.gt-proj.com/brian/baby-monitor.git
cd baby-monitor
# Install dependencies with uv
uv sync --all-extras
# Set environment variables
export ENVIRONMENT=development
export ADMIN_PASSWORD=password
export DATA_DIR=./data
# Run the application
uv run uvicorn src.baby_monitor.main:app --reload --host 0.0.0.0 --port 8000
```
## 🔧 Configuration
### Environment Variables
| Variable | Default | Description |
| ---------------- | ------------ | ---------------------------------------------- |
| `ENVIRONMENT` | `production` | Set to `development` to enable API docs |
| `ADMIN_PASSWORD` | _(required)_ | Admin user password |
| `ADMIN_USERNAME` | `admin` | Admin username |
| `DATA_DIR` | `/data` | Directory for SQLite database (SQLite only) |
| `REDIS_URI` | _(optional)_ | Redis connection URI for distributed tokens |
| `POSTGRES_URI` | _(optional)_ | PostgreSQL connection URI for database storage |
### Storage Options
**SQLite (Default)**
- Automatic setup, no configuration needed
- Data stored in `/data/baby_monitor.db`
- Perfect for single-server deployments
- Timezone-aware datetimes stored as naive UTC
**Redis (Optional - Token Storage)**
```bash
# Enable Redis token storage for distributed deployments
export REDIS_URI=redis://localhost:6379
```
**PostgreSQL (Optional - Database)**
```bash
# Enable PostgreSQL for production database
export POSTGRES_URI=postgresql://user:password@localhost:5432/baby_monitor
```
- Supports timezone-aware datetimes natively
- Recommended for production deployments
- Better performance for concurrent access
- Supports database migrations and backups
## 📁 Project Structure
```
baby-monitor/
├── src/baby_monitor/
│ ├── main.py # FastAPI application
│ ├── models/ # Pydantic models
│ ├── routers/ # API endpoints
│ │ ├── auth.py # Authentication routes
│ │ └── health.py # Health check routes
│ ├── repositories/ # Data access layer
│ │ ├── interfaces.py # Abstract interfaces
│ │ ├── user/ # User repositories
│ │ ├── token/ # Token storage
│ │ └── credentials/ # Credentials management
│ └── static/ # Frontend files
├── tests/ # Test suite
│ ├── integration/ # Integration tests
│ └── unit/ # Unit tests
├── Dockerfile # Production container
├── docker-compose.yml # Local development
└── pyproject.toml # Project dependencies
```
## 🏗️ Architecture
### Repository Pattern
The application uses the **Repository Pattern** for data access, allowing easy swapping of backends:
```python
# Switch from SQLite to PostgreSQL
from baby_monitor.repositories.user.postgresql_user import PostgreSQLUserRepository
return PostgreSQLUserRepository(db)
# Switch from in-memory to Redis tokens
# Just set REDIS_URI environment variable
```
### Technology Stack
- **Backend**: FastAPI + SQLAlchemy 2.0
- **Database**: SQLite (default) / PostgreSQL (ready)
- **Cache**: In-memory (default) / Redis (optional)
- **Package Manager**: uv
- **Container**: Docker with multi-stage builds
## 🧪 Testing
```bash
# Run all tests
uv run pytest
# Run with coverage
uv run pytest --cov-report=term-missing --cov=src/baby_monitor
# Run specific test types
uv run pytest tests/unit/
uv run pytest tests/integration/
```
## 🔒 Security
- ✅ Token-based authentication
- ✅ Environment-based secrets (no hardcoded credentials)
- ✅ API docs disabled in production
- ✅ CORS configuration ready
- ⚠️ **TODO**: Add password hashing (currently plain text comparison)
- ⚠️ **TODO**: Implement rate limiting
## 🚀 Deployment
### Unraid
1. Add the repository to Community Applications
2. Configure environment variables
3. Map `/data` volume for persistence
4. Set admin password
### Docker Swarm / Kubernetes
The application is stateless when using Redis for tokens, making it suitable for:
- Multi-replica deployments
- Load balancing
- Rolling updates
### CI/CD
Gitea Actions workflow included:
- Builds multi-architecture images (amd64, arm64)
- Automatic semantic versioning
- Pushes to container registry
- Health checks and metadata
## 📊 API Documentation
When running in development mode (`ENVIRONMENT=development`):
- **OpenAPI Docs**: http://localhost:8000/docs
- **ReDoc**: http://localhost:8000/redoc
- **OpenAPI JSON**: http://localhost:8000/openapi.json
### Key Endpoints
| Endpoint | Method | Description |
| ------------- | ------ | ---------------------- |
| `/` | GET | Serve home page |
| `/api/` | GET | Authenticated API root |
| `/api/login` | POST | User authentication |
| `/api/logout` | POST | Invalidate token |
| `/health` | GET | Health check |
| `/ready` | GET | Readiness probe |
| `/info` | GET | Feature detection |
## 🤝 Contributing
Contributions are welcome! Please:
1. Fork the repository
2. Create a feature branch (`git checkout -b feature/amazing-feature`)
3. Commit your changes (`git commit -m 'Add amazing feature'`)
4. Push to the branch (`git push origin feature/amazing-feature`)
5. Open a Pull Request
### Development Guidelines
- Write tests for new features
- Follow PEP 8 style guide
- Add type hints to all functions
- Keep line length ≤ 79 characters
- Run `mypy` and `ruff` before committing
## 📝 License
This project is licensed under the MIT License - see the LICENSE file for details.
## 🙏 Acknowledgments
- Built with [FastAPI](https://fastapi.tiangolo.com/)
- Package management by [uv](https://github.com/astral-sh/uv)
- Containerization with [Docker](https://www.docker.com/)
## 📧 Contact
Brian Bjarke Jensen - [@brian](https://gitea.gt-proj.com/brian)
Project Link: [https://gitea.gt-proj.com/brian/baby-monitor](https://gitea.gt-proj.com/brian/baby-monitor)
---
Made with ❤️ for new parents everywhere
+57
View File
@@ -0,0 +1,57 @@
services:
app:
build:
context: .
dockerfile: Dockerfile
ports:
- "8000:8000"
environment:
# Set environment to production
- ENVIRONMENT=production
# Set admin credentials
- ADMIN_USERNAME=admin
- ADMIN_PASSWORD=password
# Use Redis for token storage
- REDIS_URI=redis://redis:6379/0
# Use PostgreSQL for database
- POSTGRES_URI=postgresql://baby_monitor:securepassword@postgres:5432/baby_monitor_db
command: ["--host", "0.0.0.0", "--port", "8000"]
restart: unless-stopped
depends_on:
redis:
condition: service_healthy
postgres:
condition: service_healthy
redis:
image: redis:7-alpine
ports:
- "6379:6379"
volumes:
- redis-data:/data
restart: unless-stopped
healthcheck:
test: ["CMD", "redis-cli", "ping"]
interval: 10s
timeout: 5s
retries: 5
start_period: 1s
postgres:
image: postgres:14-alpine
environment:
- POSTGRES_USER=baby_monitor
- POSTGRES_PASSWORD=securepassword
- POSTGRES_DB=baby_monitor_db
ports:
- "5432:5432"
volumes:
- pgdata:/var/lib/postgresql/data
restart: unless-stopped
healthcheck:
test: ["CMD-SHELL", "pg_isready -U baby_monitor -d baby_monitor_db"]
interval: 10s
timeout: 5s
retries: 5
start_period: 3s
volumes:
redis-data:
pgdata:
+3 -16
View File
@@ -11,23 +11,10 @@ services:
# Persist database to local directory # Persist database to local directory
- ./data:/data - ./data:/data
environment: environment:
# Set environment to development for hot-reloading and debug features
- ENVIRONMENT=development - ENVIRONMENT=development
# Optional: Override admin credentials for development # Optional: Override admin credentials for development
# - ADMIN_USERNAME=admin - ADMIN_USERNAME=admin
# - ADMIN_PASSWORD=devpassword - ADMIN_PASSWORD=password
# Optional: Use Redis for token storage (uncomment redis service below)
# - REDIS_URI=redis://redis:6379/0
command: ["--host", "0.0.0.0", "--port", "8000", "--reload"] command: ["--host", "0.0.0.0", "--port", "8000", "--reload"]
restart: unless-stopped restart: unless-stopped
# Uncomment to enable Redis token storage
# redis:
# image: redis:7-alpine
# ports:
# - "6379:6379"
# volumes:
# - redis-data:/data
# restart: unless-stopped
# Uncomment if using Redis
# volumes:
# redis-data:
+6
View File
@@ -5,6 +5,7 @@ description = "Add your description here"
readme = "README.md" readme = "README.md"
requires-python = ">=3.12" requires-python = ">=3.12"
dependencies = [ dependencies = [
"bcrypt>=4.0.0",
"fastapi>=0.121.0", "fastapi>=0.121.0",
"sqlalchemy>=2.0.0", "sqlalchemy>=2.0.0",
"uvicorn>=0.38.0", "uvicorn>=0.38.0",
@@ -30,6 +31,7 @@ dev = [
"httpx>=0.28.1", "httpx>=0.28.1",
"mypy>=1.18.2", "mypy>=1.18.2",
"pre-commit>=4.3.0", "pre-commit>=4.3.0",
"prettier>=0.0.7",
"pytest>=8.4.2", "pytest>=8.4.2",
"pytest-cov>=7.0.0", "pytest-cov>=7.0.0",
"pyupgrade>=3.21.0", "pyupgrade>=3.21.0",
@@ -69,3 +71,7 @@ markers = [
[[tool.mypy.overrides]] [[tool.mypy.overrides]]
module = "redis.*" module = "redis.*"
ignore_missing_imports = true ignore_missing_imports = true
[[tool.mypy.overrides]]
module = "showcase_data_definitions.*"
ignore_missing_imports = true
+185
View File
@@ -0,0 +1,185 @@
"""Seed test data into the database for demo purposes."""
import sys
from pathlib import Path
from datetime import datetime
# Add parent directory to path to import baby_monitor modules
sys.path.insert(0, str(Path(__file__).parent.parent / "src"))
# Import after path is set up
from baby_monitor.repositories.dependencies.get_database import ( # noqa: E402
get_database,
init_db,
)
from baby_monitor.repositories.user.sqlite_user import ( # noqa: E402
DatabaseUserRepository,
)
from baby_monitor.repositories.child.sqlite_child import ( # noqa: E402
DatabaseChildRepository,
)
from baby_monitor.repositories.feeding.sqlite_feeding import ( # noqa: E402
DatabaseFeedingRepository,
)
from baby_monitor.repositories.diaper_change.sqlite_diaper_change import ( # noqa: E402, E501
DatabaseDiaperChangeRepository,
)
from baby_monitor.repositories.sleep.sqlite_sleep import ( # noqa: E402
DatabaseSleepRepository,
)
from baby_monitor.routers.auth import hash_password # noqa: E402
from showcase_data_definitions import generate_showcase_data # noqa: E402
def seed_database(reference_time: datetime | None = None) -> None:
"""
Seed the database with test data.
This function is idempotent - it will check if test users exist
and either create them or update timestamps of existing data.
Args:
reference_time: The "now" time to use for generating timestamps.
Defaults to current time.
"""
# Initialize database
init_db()
db = next(get_database())
try:
# Initialize repositories
user_repo = DatabaseUserRepository(db)
child_repo = DatabaseChildRepository(db)
feeding_repo = DatabaseFeedingRepository(db)
diaper_repo = DatabaseDiaperChangeRepository(db)
sleep_repo = DatabaseSleepRepository(db)
# Generate showcase data
test_data = generate_showcase_data(reference_time)
print("Starting database seeding...")
print(f"Reference time: {test_data['reference_time']}")
# Create or get showcase users
user_ids = []
for user_data in test_data["users"]:
# Check if user exists
existing_user = user_repo.get_by_username(user_data["username"])
if existing_user:
print(f"✓ User '{user_data['username']}' already exists")
user_ids.append(existing_user["id"])
else:
# Create new user
hashed_pw = hash_password(user_data["password"])
user_id = user_repo.create(
username=user_data["username"],
hashed_password=hashed_pw,
)
user_ids.append(user_id["id"])
print(f"✓ Created user '{user_data['username']}'")
# Create or get shared child
child_data = test_data["child"]
# Check if child exists for first user
existing_children = child_repo.get_by_user_id(user_ids[0])
child_id: int | None = None
# Look for existing child with matching name
for child in existing_children:
if child["name"] == child_data["name"]:
child_id = child["id"]
print(f"✓ Child '{child_data['name']}' already exists")
break
if child_id is None:
# Create new child
created_child = child_repo.create(
name=child_data["name"],
birth_time=child_data["birth_time"],
birth_weight=child_data["birth_weight"],
user_id=user_ids[0],
)
child_id = created_child["id"]
print(f"✓ Created child '{child_data['name']}'")
# Ensure child_id is set
assert child_id is not None, "Child ID must be set at this point"
# Share child with second user if not already shared
parent_ids = child_repo.get_parent_ids(child_id)
if user_ids[1] not in parent_ids:
child_repo.add_parent(child_id, user_ids[1])
msg = f"✓ Shared child with '{test_data['users'][1]['username']}'"
print(msg)
# Clear existing logs to avoid duplicates
print("Clearing existing logs...")
# Get all logs for this child
existing_feedings = feeding_repo.get_by_child_id(child_id)
for feeding in existing_feedings:
feeding_repo.delete(feeding["id"])
existing_diapers = diaper_repo.get_by_child_id(child_id)
for diaper in existing_diapers:
diaper_repo.delete(diaper["id"])
existing_sleep = sleep_repo.get_by_child_id(child_id)
for sleep in existing_sleep:
sleep_repo.delete(sleep["id"])
print("✓ Cleared existing logs")
# Add feeding logs
print(f"Adding {len(test_data['feedings'])} feeding logs...")
for feeding in test_data["feedings"]:
feeding_repo.create(
child_id=child_id,
start_time=feeding["start_time"],
end_time=feeding["end_time"],
feeding_type=feeding["feeding_type"],
)
print(f"✓ Added {len(test_data['feedings'])} feedings")
# Add diaper changes
print(f"Adding {len(test_data['diapers'])} diaper changes...")
for diaper in test_data["diapers"]:
diaper_repo.create(
child_id=child_id,
change_time=diaper["time"],
poop_color=diaper.get("poop_color"),
poop_amount=diaper.get("poop_amount"),
pee_color=diaper.get("pee_color"),
pee_amount=diaper.get("pee_amount"),
)
print(f"✓ Added {len(test_data['diapers'])} diaper changes")
# Add sleep sessions
print(f"Adding {len(test_data['sleep'])} sleep sessions...")
for sleep in test_data["sleep"]:
sleep_repo.create(
child_id=child_id,
start_time=sleep["start_time"],
end_time=sleep["end_time"],
)
print(f"✓ Added {len(test_data['sleep'])} sleep sessions")
db.commit()
print("\n✅ Database seeding completed successfully!")
print("\nTest user credentials:")
print(f" Username: {test_data['users'][0]['username']}")
print(f" Password: {test_data['users'][0]['password']}")
print(" (Both users share the same password)")
except Exception as e:
db.rollback()
print(f"\n❌ Error seeding database: {e}")
raise
finally:
db.close()
if __name__ == "__main__":
seed_database()
+278
View File
@@ -0,0 +1,278 @@
"""Definition of showcase data to be used for presenting the app."""
from datetime import datetime, timedelta
import random
# User credentials
SHOWCASE_USERS = [
{
"username": "user",
"password": "demo123", # Will be hashed when inserted
},
{
"username": "user2",
"password": "demo123", # Will be hashed when inserted
},
]
# Shared child (14 days old)
CHILD_AGE_DAYS = 14
def get_child_data(reference_time: datetime) -> dict:
"""Get child data with birth time relative to reference time."""
birth_time = reference_time - timedelta(days=CHILD_AGE_DAYS)
return {
"name": "Emma Rose",
"birth_time": birth_time,
"birth_weight": 3420, # grams (7.5 lbs)
}
def get_feeding_schedule(reference_time: datetime) -> list[dict]:
"""
Generate realistic feeding schedule for the last 14 days.
Newborns feed every 2-3 hours initially, gradually spacing out
to 3-4 hours.
"""
feedings: list[dict] = []
current_time = reference_time - timedelta(days=CHILD_AGE_DAYS)
end_time = reference_time
feeding_types = ["left_breast", "right_breast", "bottle"]
# Day-by-day feeding patterns
day_number = 0
while current_time < end_time:
age_in_days = day_number
# Newborns feed more frequently
if age_in_days < 3:
interval_hours = random.uniform(2, 2.5)
duration_minutes = random.randint(15, 25)
elif age_in_days < 7:
interval_hours = random.uniform(2.5, 3)
duration_minutes = random.randint(20, 30)
else:
interval_hours = random.uniform(3, 3.5)
duration_minutes = random.randint(20, 35)
# Alternate between breasts and occasional bottle
if random.random() < 0.2: # 20% bottle feeding
feeding_type = "bottle"
else:
# Alternate breasts
feeding_type = feeding_types[len(feedings) % 2]
start_time = current_time
end_time_feeding = start_time + timedelta(minutes=duration_minutes)
feedings.append(
{
"start_time": start_time,
"end_time": end_time_feeding,
"feeding_type": feeding_type,
}
)
current_time += timedelta(hours=interval_hours)
# Move to next day
prev_date = (current_time - timedelta(hours=interval_hours)).date()
if current_time.date() != prev_date:
day_number += 1
return feedings
def get_diaper_changes(reference_time: datetime) -> list[dict]:
"""
Generate realistic diaper changes for the last 14 days.
- First 2-3 days: Black/dark (meconium), minimal pee
- Days 3-5: Transition to yellow, more frequent
- Days 5+: Regular yellow stools, normal pee patterns
- 8-10 diaper changes per day initially, settling to 6-8
"""
diapers = []
current_time = reference_time - timedelta(days=CHILD_AGE_DAYS)
end_time = reference_time
day_number = 0
while current_time < end_time:
age_in_days = day_number
# Determine number of diaper changes per day based on age
if age_in_days < 3:
changes_per_day = random.randint(8, 10)
elif age_in_days < 7:
changes_per_day = random.randint(7, 9)
else:
changes_per_day = random.randint(6, 8)
# Distribute changes throughout the day
day_start = current_time.replace(hour=0, minute=0, second=0, microsecond=0)
day_end = day_start + timedelta(days=1)
for _ in range(changes_per_day):
# Random time during the day
random_seconds = random.randint(0, 86400)
change_time = day_start + timedelta(seconds=random_seconds)
if change_time >= end_time:
break
# Determine diaper contents
has_poop = random.random() < 0.4 # 40% have poop
# 90% have pee, or always if no poop
has_pee = random.random() < 0.9 or not has_poop
diaper = {
"time": change_time,
"has_poop": has_poop,
"has_pee": has_pee,
}
# Poop characteristics based on age
if has_poop:
if age_in_days < 2:
# Meconium phase
diaper["poop_color"] = "black"
diaper["poop_amount"] = "light"
elif age_in_days < 4:
# Transition phase
colors = ["black", "green", "yellow"]
diaper["poop_color"] = random.choice(colors)
amounts = ["light", "medium"]
diaper["poop_amount"] = random.choice(amounts)
else:
# Normal phase
colors = ["yellow", "yellow", "yellow", "green"]
diaper["poop_color"] = random.choice(colors)
# Amount increases with age
if age_in_days < 7:
amounts = ["light", "medium"]
diaper["poop_amount"] = random.choice(amounts)
else:
amounts = ["medium", "heavy"]
diaper["poop_amount"] = random.choice(amounts)
# Pee characteristics based on age
if has_pee:
if age_in_days < 2:
# Very light pee initially
diaper["pee_amount"] = "light"
diaper["pee_color"] = random.choice(["clear", "yellow"])
elif age_in_days < 5:
# Increasing output
diaper["pee_amount"] = random.choice(["light", "medium"])
diaper["pee_color"] = random.choice(["clear", "yellow"])
else:
# Normal output
if age_in_days < 10:
amounts = ["medium", "medium", "heavy"]
diaper["pee_amount"] = random.choice(amounts)
else:
amounts = ["medium", "heavy", "heavy"]
diaper["pee_amount"] = random.choice(amounts)
colors = ["clear", "yellow", "yellow"]
diaper["pee_color"] = random.choice(colors)
diapers.append(diaper)
day_number += 1
current_time = day_end
# Sort by time (type: ignore for mypy - we know time is datetime)
diapers.sort(
key=lambda x: x["time"] # type: ignore[arg-type,return-value]
)
return diapers
def get_sleep_sessions(reference_time: datetime) -> list[dict]:
"""
Generate realistic sleep patterns for the last 14 days.
Newborns sleep 16-18 hours per day in short bursts (30min - 4 hours).
Sleep gradually consolidates over time.
"""
sleep_sessions = []
current_time = reference_time - timedelta(days=CHILD_AGE_DAYS)
end_time = reference_time
day_number = 0
while current_time < end_time:
age_in_days = day_number
# Sleep patterns evolve with age
if age_in_days < 3:
# Very short, frequent naps
avg_wake_time = 1.5 # hours
sleep_duration_range = (30, 120) # minutes
elif age_in_days < 7:
# Slightly longer sleep periods
avg_wake_time = 2
sleep_duration_range = (45, 180)
else:
# More consolidated sleep
avg_wake_time = 2.5
sleep_duration_range = (60, 240)
# Random wake time with variation
wake_minutes = random.randint(int(avg_wake_time * 45), int(avg_wake_time * 75))
# Sleep start time
start_time = current_time + timedelta(minutes=wake_minutes)
if start_time >= end_time:
break
# Sleep duration
duration_minutes = random.randint(*sleep_duration_range)
# Longer sleep at night
if 20 <= start_time.hour or start_time.hour < 6:
duration_minutes = int(duration_minutes * 1.3)
end_time_sleep = start_time + timedelta(minutes=duration_minutes)
sleep_sessions.append(
{
"start_time": start_time,
"end_time": end_time_sleep,
}
)
current_time = end_time_sleep
birth_time = reference_time - timedelta(days=CHILD_AGE_DAYS)
day_number = (current_time - birth_time).days
return sleep_sessions
def generate_showcase_data(reference_time: datetime | None = None) -> dict:
"""
Generate all test data with timestamps relative to reference time.
Args:
reference_time: The "now" time to use as reference.
Defaults to current time.
Returns:
Dictionary containing all test data
"""
if reference_time is None:
reference_time = datetime.now()
return {
"users": SHOWCASE_USERS,
"child": get_child_data(reference_time),
"feedings": get_feeding_schedule(reference_time),
"diapers": get_diaper_changes(reference_time),
"sleep": get_sleep_sessions(reference_time),
"reference_time": reference_time,
}
+89
View File
@@ -11,6 +11,11 @@ from fastapi.staticfiles import StaticFiles
from baby_monitor.routers.auth import router as auth_router from baby_monitor.routers.auth import router as auth_router
from baby_monitor.routers.auth import verify_token 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.routers.health import router as health_router
from baby_monitor.repositories.dependencies.get_database import init_db from baby_monitor.repositories.dependencies.get_database import init_db
@@ -45,15 +50,99 @@ app.mount("/static", StaticFiles(directory=str(static_path)), name="static")
# Include routers # Include routers
app.include_router(auth_router) 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) app.include_router(health_router)
# Serve HTML pages at root level
@app.get("/", include_in_schema=False) @app.get("/", include_in_schema=False)
def serve_home() -> FileResponse: def serve_home() -> FileResponse:
"""Serve the home page (handles auth check client-side).""" """Serve the home page (handles auth check client-side)."""
return FileResponse(static_path / "index.html") return FileResponse(static_path / "index.html")
@app.get("/login.html", include_in_schema=False)
def serve_login() -> FileResponse:
"""Serve the login page."""
return FileResponse(static_path / "login.html")
@app.get("/register.html", include_in_schema=False)
def serve_register() -> FileResponse:
"""Serve the registration page."""
return FileResponse(static_path / "register.html")
@app.get("/admin.html", include_in_schema=False)
def serve_admin() -> FileResponse:
"""Serve the admin page."""
return FileResponse(static_path / "admin.html")
@app.get("/add-child.html", include_in_schema=False)
def serve_add_child() -> FileResponse:
"""Serve the add child page."""
return FileResponse(static_path / "add-child.html")
@app.get("/log-feeding.html", include_in_schema=False)
def serve_log_feeding() -> FileResponse:
"""Serve the log feeding page."""
return FileResponse(static_path / "log-feeding.html")
@app.get("/feedings.html", include_in_schema=False)
def serve_feedings() -> FileResponse:
"""Serve the feedings overview page."""
return FileResponse(static_path / "feedings.html")
@app.get("/diapers.html", include_in_schema=False)
def serve_diapers() -> FileResponse:
"""Serve the diaper changes overview page."""
return FileResponse(static_path / "diapers.html")
@app.get("/log-diaper.html", include_in_schema=False)
def serve_log_diaper() -> FileResponse:
"""Serve the log diaper change page."""
return FileResponse(static_path / "log-diaper.html")
@app.get("/sleep.html", include_in_schema=False)
def serve_sleep() -> FileResponse:
"""Serve the sleep overview page."""
return FileResponse(static_path / "sleep.html")
@app.get("/log-sleep.html", include_in_schema=False)
def serve_log_sleep() -> FileResponse:
"""Serve the log sleep page."""
return FileResponse(static_path / "log-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/") @app.get("/api/")
def read_root(token: Annotated[str, Depends(verify_token)]) -> dict: def read_root(token: Annotated[str, Depends(verify_token)]) -> dict:
"""API root endpoint (requires authentication).""" """API root endpoint (requires authentication)."""
+19
View File
@@ -16,4 +16,23 @@ class LoginResponse(BaseModel):
message: str message: str
username: str username: str
access_token: str access_token: str
is_admin: bool
token_type: str = "bearer"
class RegisterRequest(BaseModel):
"""Request model for user registration."""
username: str
password: str
invitation_token: str
class RegisterResponse(BaseModel):
"""Response model for successful registration."""
message: str
username: str
access_token: str
is_admin: bool
token_type: str = "bearer" token_type: str = "bearer"
+24
View File
@@ -0,0 +1,24 @@
"""Child-related request and response models."""
from datetime import datetime
from pydantic import BaseModel, Field
class CreateChildRequest(BaseModel):
"""Request model for creating a child."""
name: str = Field(..., min_length=1, max_length=100)
birth_time: datetime
birth_weight: float = Field(..., gt=0, description="Birth weight in grams")
class ChildResponse(BaseModel):
"""Response model for child data."""
id: int
name: str
birth_time: datetime
birth_weight: float
created_at: datetime
parent_count: int | None = None
parent_usernames: list[str] | None = None
@@ -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
)
+29
View File
@@ -0,0 +1,29 @@
"""Child database model."""
from typing import TYPE_CHECKING
from sqlalchemy import Column, Integer, String, DateTime, Float
from datetime import datetime
if TYPE_CHECKING:
from sqlalchemy.orm import DeclarativeBase
Base = DeclarativeBase
else:
from baby_monitor.repositories.dependencies.get_database import Base
class Child(Base):
"""Child database model."""
__tablename__ = "children"
id = Column(Integer, primary_key=True, index=True)
name = Column(String, nullable=False)
birth_time = Column(DateTime(timezone=True), nullable=False)
birth_weight = Column(Float, nullable=False) # in grams
created_at = Column(
DateTime(timezone=True), default=datetime.utcnow, nullable=False
)
def __repr__(self) -> str:
return f"<Child(id={self.id}, name='{self.name}')>"
@@ -0,0 +1,31 @@
"""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(timezone=True), 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,32 @@
"""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(timezone=True), 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(timezone=True), default=datetime.now(UTC), nullable=False
)
def __repr__(self) -> str:
return f"<DiaperChange(id={self.id}, child_id={self.child_id})>"
+30
View File
@@ -0,0 +1,30 @@
"""Feeding database model."""
from typing import TYPE_CHECKING
from sqlalchemy import Column, Integer, DateTime, ForeignKey, String
from datetime import datetime, UTC
if TYPE_CHECKING:
from sqlalchemy.orm import DeclarativeBase
Base = DeclarativeBase
else:
from baby_monitor.repositories.dependencies.get_database import Base
class Feeding(Base):
"""Feeding log database model."""
__tablename__ = "feedings"
id = Column(Integer, primary_key=True, index=True)
child_id = Column(Integer, ForeignKey("children.id"), nullable=False)
start_time = Column(DateTime(timezone=True), nullable=False)
end_time = Column(DateTime(timezone=True), nullable=True)
feeding_type = Column(String, nullable=False) # stores FeedingType enum
created_at = Column(
DateTime(timezone=True), default=datetime.now(UTC), nullable=False
)
def __repr__(self) -> str:
return f"<Feeding(id={self.id}, child_id={self.child_id})>"
+29
View File
@@ -0,0 +1,29 @@
"""Sleep database model."""
from typing import TYPE_CHECKING
from datetime import datetime, UTC
from sqlalchemy import Column, Integer, DateTime, ForeignKey
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(timezone=True), nullable=False)
end_time = Column(DateTime(timezone=True), nullable=True)
created_at = Column(
DateTime(timezone=True), default=datetime.now(UTC), nullable=False
)
def __repr__(self) -> str:
return f"<Sleep(id={self.id}, child_id={self.child_id})>"
+12 -3
View File
@@ -1,9 +1,15 @@
"""Database models.""" """Database models."""
from sqlalchemy import Column, Integer, String, DateTime from typing import TYPE_CHECKING
from sqlalchemy import Column, Integer, String, DateTime, Boolean
from datetime import datetime from datetime import datetime
from baby_monitor.repositories.dependencies.get_database import Base if TYPE_CHECKING:
from sqlalchemy.orm import DeclarativeBase
Base = DeclarativeBase
else:
from baby_monitor.repositories.dependencies.get_database import Base
class User(Base): class User(Base):
@@ -14,7 +20,10 @@ class User(Base):
id = Column(Integer, primary_key=True, index=True) id = Column(Integer, primary_key=True, index=True)
username = Column(String, unique=True, index=True, nullable=False) username = Column(String, unique=True, index=True, nullable=False)
hashed_password = Column(String, nullable=False) hashed_password = Column(String, nullable=False)
created_at = Column(DateTime, default=datetime.utcnow, nullable=False) is_admin = Column(Boolean, default=False, nullable=False)
created_at = Column(
DateTime(timezone=True), default=datetime.utcnow, nullable=False
)
def __repr__(self) -> str: def __repr__(self) -> str:
return f"<User(id={self.id}, username='{self.username}')>" return f"<User(id={self.id}, username='{self.username}')>"
+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
+44
View File
@@ -0,0 +1,44 @@
"""Feeding type enumeration."""
from enum import StrEnum
class FeedingType(StrEnum):
"""Enumeration of feeding types."""
LEFT_BREAST = "left_breast"
RIGHT_BREAST = "right_breast"
BOTTLE = "bottle"
class PoopAmount(StrEnum):
"""Enumeration of poop amounts."""
LIGHT = "light"
MEDIUM = "medium"
HEAVY = "heavy"
class PoopColor(StrEnum):
"""Enumeration of poop colors."""
BLACK = "black"
YELLOW = "yellow"
GREEN = "green"
BROWN = "brown"
class PeeAmount(StrEnum):
"""Enumeration of pee amounts."""
LIGHT = "light"
MEDIUM = "medium"
HEAVY = "heavy"
class PeeColor(StrEnum):
"""Enumeration of pee colors."""
CLEAR = "clear"
YELLOW = "yellow"
RED = "red"
+35
View File
@@ -0,0 +1,35 @@
"""Feeding-related request and response models."""
from datetime import datetime
from pydantic import BaseModel, Field
from baby_monitor.models.enums import FeedingType
class CreateFeedingRequest(BaseModel):
"""Request model for creating a feeding log."""
child_id: int = Field(..., gt=0)
start_time: datetime
end_time: datetime | None = None
feeding_type: FeedingType
class UpdateFeedingRequest(BaseModel):
"""Request model for updating a feeding log."""
start_time: datetime | None = None
end_time: datetime | None = None
feeding_type: FeedingType | None = None
class FeedingResponse(BaseModel):
"""Response model for feeding log data."""
id: int
child_id: int
start_time: datetime
end_time: datetime | None
feeding_type: str
created_at: datetime
child_name: str | None = None # Optional, populated when needed
+37
View File
@@ -0,0 +1,37 @@
"""Invitation token model for user registration.
Note: DateTime(timezone=True) is used for PostgreSQL compatibility.
SQLite will store as naive UTC, which is handled in the repository layer.
"""
from datetime import datetime
from typing import TYPE_CHECKING
from sqlalchemy import Boolean, DateTime, Integer, String
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 Invitation(Base):
"""Invitation token for new user registration."""
__tablename__ = "invitations"
id: Mapped[int] = mapped_column(Integer, primary_key=True, autoincrement=True)
token: Mapped[str] = mapped_column(String, unique=True, nullable=False)
created_at: Mapped[datetime] = mapped_column(
DateTime(timezone=True), nullable=False
)
expires_at: Mapped[datetime] = mapped_column(
DateTime(timezone=True), nullable=False
)
created_by_user_id: Mapped[int] = mapped_column(Integer, nullable=False)
is_consumed: Mapped[bool] = mapped_column(Boolean, default=False, nullable=False)
consumed_at: Mapped[datetime | None] = mapped_column(
DateTime(timezone=True), nullable=True
)
+29
View File
@@ -0,0 +1,29 @@
"""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
end_time: datetime | None = None
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.""" """Repository implementations package."""
from baby_monitor.repositories.dependencies import ( from baby_monitor.repositories.dependencies import (
get_child_repository,
get_credentials_repository, get_credentials_repository,
get_diaper_change_repository,
get_feeding_repository,
get_invitation_repository,
get_sleep_repository,
get_token_repository, get_token_repository,
get_user_repository, get_user_repository,
) )
__all__ = [ __all__ = [
"get_child_repository",
"get_credentials_repository", "get_credentials_repository",
"get_diaper_change_repository",
"get_feeding_repository",
"get_invitation_repository",
"get_sleep_repository",
"get_token_repository", "get_token_repository",
"get_user_repository", "get_user_repository",
] ]
@@ -0,0 +1,179 @@
"""Database-agnostic implementation of child repository.
Works with both SQLite and PostgreSQL.
"""
from datetime import datetime, UTC
from sqlalchemy.orm import Session
from baby_monitor.repositories.interfaces import (
ChildRepositoryInterface,
)
from baby_monitor.models.db.child import Child
from baby_monitor.models.db.child_parent import ChildParent
class DatabaseChildRepository(ChildRepositoryInterface):
"""Database implementation for child data access.
Works with both SQLite and PostgreSQL databases.
"""
def __init__(self, db: Session):
self.db = db
def create(
self, name: str, birth_time: datetime, birth_weight: float, user_id: int
) -> dict:
"""Create a new child record and link to user."""
child = Child(
name=name,
birth_time=birth_time,
birth_weight=birth_weight,
)
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,
"created_at": child.created_at,
}
def get_by_id(self, child_id: int) -> dict | None:
"""Get a child by ID."""
child = self.db.query(Child).filter(Child.id == child_id).first()
if not child:
return None
return {
"id": child.id,
"name": child.name,
"birth_time": child.birth_time,
"birth_weight": child.birth_weight,
"created_at": child.created_at,
}
def get_by_user_id(self, user_id: int) -> list[dict]:
"""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 [
{
"id": child.id,
"name": child.name,
"birth_time": child.birth_time,
"birth_weight": child.birth_weight,
"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,
name: str | None = None,
birth_time: datetime | None = None,
birth_weight: float | None = None,
) -> dict | None:
"""Update a child record."""
child = self.db.query(Child).filter(Child.id == child_id).first()
if not child:
return None
if name is not None:
child.name = name # type: ignore[assignment]
if birth_time is not None:
child.birth_time = birth_time # type: ignore[assignment]
if birth_weight is not None:
child.birth_weight = birth_weight # type: ignore[assignment]
self.db.commit()
self.db.refresh(child)
return {
"id": child.id,
"name": child.name,
"birth_time": child.birth_time,
"birth_weight": child.birth_weight,
"created_at": child.created_at,
}
def delete(self, child_id: int) -> bool:
"""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,13 @@
"""Child invitation repository implementations."""
from baby_monitor.repositories.child_invitation.sqlite_child_invitation import ( # noqa: E501
DatabaseChildInvitationRepository,
)
# Keep old name for backward compatibility
SQLiteChildInvitationRepository = DatabaseChildInvitationRepository
__all__ = [
"DatabaseChildInvitationRepository",
"SQLiteChildInvitationRepository",
]
@@ -0,0 +1,118 @@
"""Database-agnostic implementation of child invitation repository.
Supports both SQLite and PostgreSQL:
- SQLite: stores datetimes as naive UTC
- PostgreSQL: stores datetimes as timezone-aware
"""
from datetime import datetime, UTC
from sqlalchemy.orm import Session
from baby_monitor.models.child_invitation import ChildInvitation
from baby_monitor.repositories.interfaces import (
ChildInvitationRepositoryInterface,
)
class DatabaseChildInvitationRepository(ChildInvitationRepositoryInterface):
"""Database implementation of child invitation repository.
Works with both SQLite and PostgreSQL databases.
"""
def __init__(self, db: Session):
"""Initialize the repository with a database session."""
self.db = db
def _get_now_utc(self, reference_dt: datetime) -> datetime:
"""
Get current UTC time matching the timezone awareness of reference.
Args:
reference_dt: A datetime from DB to match timezone format
Returns:
Current UTC time (naive for SQLite, aware for PostgreSQL)
"""
now = datetime.now(UTC)
if reference_dt.tzinfo is None:
# SQLite: return naive UTC
return now.replace(tzinfo=None)
# PostgreSQL: return timezone-aware
return now
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
# Get current time matching database timezone format
now_utc = self._get_now_utc(invitation.expires_at)
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.""" """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_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_token_repository import get_token_repository
from .get_user_repository import get_user_repository from .get_user_repository import get_user_repository
__all__ = [ __all__ = [
"get_user_repository", "get_child_invitation_repository",
"get_token_repository", "get_child_repository",
"get_credentials_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,19 @@
"""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
DatabaseChildInvitationRepository,
)
from baby_monitor.repositories.interfaces import (
ChildInvitationRepositoryInterface,
)
from baby_monitor.repositories.dependencies.get_database import get_database
def get_child_invitation_repository(
db: Annotated[Session, Depends(get_database)],
) -> ChildInvitationRepositoryInterface:
"""Get child invitation repository instance (works with any database)."""
return DatabaseChildInvitationRepository(db)
@@ -0,0 +1,18 @@
"""Dependency for getting child repository instance."""
from typing import Annotated
from fastapi import Depends
from sqlalchemy.orm import Session
from baby_monitor.repositories.dependencies.get_database import get_database
from baby_monitor.repositories.child.sqlite_child import DatabaseChildRepository
from baby_monitor.repositories.interfaces.child_repository_interface import (
ChildRepositoryInterface,
)
def get_child_repository(
db: Annotated[Session, Depends(get_database)],
) -> ChildRepositoryInterface:
"""Get child repository instance (works with any database)."""
return DatabaseChildRepository(db)
@@ -3,35 +3,115 @@
import os import os
from pathlib import Path from pathlib import Path
from collections.abc import Generator from collections.abc import Generator
from typing import TYPE_CHECKING
from sqlalchemy import create_engine from sqlalchemy import create_engine
from sqlalchemy.orm import declarative_base, sessionmaker, Session from sqlalchemy.orm import declarative_base, sessionmaker, Session
# Database directory if TYPE_CHECKING:
from sqlalchemy.orm import DeclarativeBase
# Database directory (used for SQLite)
DATA_DIR = Path(os.getenv("DATA_DIR", "/data")) DATA_DIR = Path(os.getenv("DATA_DIR", "/data"))
# SQLite database URL # Check for PostgreSQL URI, otherwise use SQLite
DATABASE_URL = f"sqlite:///{DATA_DIR}/baby_monitor.db" POSTGRES_URI = os.getenv("POSTGRES_URI")
# Create engine with check_same_thread=False for SQLite if POSTGRES_URI:
engine = create_engine( # Use PostgreSQL
DATABASE_URL, DATABASE_URL = POSTGRES_URI
connect_args={"check_same_thread": False}, # PostgreSQL doesn't need special connect_args
echo=False, # Set to True for SQL query logging engine = create_engine(
) DATABASE_URL,
echo=False, # Set to True for SQL query logging
pool_pre_ping=True, # Verify connections before using them
)
else:
# Use SQLite (default)
DATABASE_URL = f"sqlite:///{DATA_DIR}/baby_monitor.db"
# Create engine with check_same_thread=False for SQLite
engine = create_engine(
DATABASE_URL,
connect_args={"check_same_thread": False},
echo=False, # Set to True for SQL query logging
)
# Session factory # Session factory
SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine) SessionLocal = sessionmaker(autocommit=False, autoflush=False, bind=engine)
# Base class for declarative models # Base class for declarative models
Base = declarative_base() Base: "type[DeclarativeBase]" = declarative_base()
def _ensure_admin_user() -> None:
"""Create or update admin user from environment variables."""
from baby_monitor.models.db.user import User
from baby_monitor.utils import hash_password
admin_username = os.getenv("ADMIN_USERNAME")
admin_password = os.getenv("ADMIN_PASSWORD")
if not admin_username:
raise RuntimeError(
"ADMIN_USERNAME environment variable is required but not set"
)
if not admin_password:
raise RuntimeError(
"ADMIN_PASSWORD environment variable is required but not set"
)
db = SessionLocal()
try:
# Check if admin user exists
admin_user = db.query(User).filter(User.username == admin_username).first()
hashed_pw = hash_password(admin_password)
if admin_user:
# Update existing admin user's password and ensure admin flag
admin_user.hashed_password = hashed_pw # type: ignore[assignment]
admin_user.is_admin = True # type: ignore[assignment]
db.commit()
else:
# Create new admin user
new_admin = User(
username=admin_username,
hashed_password=hashed_pw,
is_admin=True,
)
db.add(new_admin)
db.commit()
finally:
db.close()
def init_db() -> None: def init_db() -> None:
"""Initialize the database by creating all tables.""" """Initialize the database by creating all tables."""
# Ensure data directory exists # Import models to register them with Base.metadata
DATA_DIR.mkdir(parents=True, exist_ok=True) # 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 ( # noqa: F401
ChildParent,
)
from baby_monitor.models.db.feeding import Feeding # noqa: F401
from baby_monitor.models.db.diaper_change import ( # noqa: F401
DiaperChange,
)
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 ( # noqa: F401
ChildInvitation,
)
# Ensure data directory exists (only needed for SQLite)
if not POSTGRES_URI:
DATA_DIR.mkdir(parents=True, exist_ok=True)
Base.metadata.create_all(bind=engine) Base.metadata.create_all(bind=engine)
# Create admin user if it doesn't exist
_ensure_admin_user()
def get_database() -> Generator[Session, None, None]: def get_database() -> Generator[Session, None, None]:
""" """
@@ -0,0 +1,20 @@
"""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 (
DatabaseDiaperChangeRepository,
)
from baby_monitor.repositories.interfaces.diaper_change_repository_interface import ( # noqa: E501
DiaperChangeRepositoryInterface,
)
def get_diaper_change_repository(
db: Annotated[Session, Depends(get_database)],
) -> DiaperChangeRepositoryInterface:
"""Get diaper change repository instance (works with any database)."""
return DatabaseDiaperChangeRepository(db)
@@ -0,0 +1,20 @@
"""Dependency for getting feeding repository instance."""
from typing import Annotated
from fastapi import Depends
from sqlalchemy.orm import Session
from baby_monitor.repositories.dependencies.get_database import get_database
from baby_monitor.repositories.feeding.sqlite_feeding import (
DatabaseFeedingRepository,
)
from baby_monitor.repositories.interfaces.feeding_repository_interface import (
FeedingRepositoryInterface,
)
def get_feeding_repository(
db: Annotated[Session, Depends(get_database)],
) -> FeedingRepositoryInterface:
"""Get feeding repository instance (works with any database)."""
return DatabaseFeedingRepository(db)
@@ -0,0 +1,28 @@
"""Dependency injection for invitation repository."""
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.invitation.sqlite_invitation import (
DatabaseInvitationRepository,
)
from baby_monitor.repositories.interfaces.invitation_repository_interface import (
InvitationRepositoryInterface,
)
def get_invitation_repository(
db: Annotated[Session, Depends(get_database)],
) -> InvitationRepositoryInterface:
"""
Provide an invitation repository instance.
Args:
db: Database session from dependency injection
Returns:
InvitationRepositoryInterface instance (works with any database)
"""
return DatabaseInvitationRepository(db)
@@ -0,0 +1,18 @@
"""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 DatabaseSleepRepository
from baby_monitor.repositories.interfaces.sleep_repository_interface import (
SleepRepositoryInterface,
)
def get_sleep_repository(
db: Annotated[Session, Depends(get_database)],
) -> SleepRepositoryInterface:
"""Get sleep repository instance (works with any database)."""
return DatabaseSleepRepository(db)
@@ -11,7 +11,7 @@ from baby_monitor.repositories.interfaces import (
UserRepositoryInterface, UserRepositoryInterface,
) )
from baby_monitor.repositories.user.sqlite_user import ( from baby_monitor.repositories.user.sqlite_user import (
SQLiteUserRepository, DatabaseUserRepository,
) )
# Singleton instance # Singleton instance
@@ -22,12 +22,12 @@ def get_user_repository(
db: Annotated[Session, Depends(get_database)], db: Annotated[Session, Depends(get_database)],
) -> UserRepositoryInterface: ) -> UserRepositoryInterface:
""" """
Get user repository instance. Get user repository instance (works with any database).
""" """
global _user_repository global _user_repository
if _user_repository is None: if _user_repository is None:
_user_repository = SQLiteUserRepository(db) _user_repository = DatabaseUserRepository(db)
return _user_repository return _user_repository
@@ -0,0 +1,141 @@
"""Database-agnostic implementation of diaper change repository.
Works with both SQLite and PostgreSQL.
"""
from datetime import datetime
from sqlalchemy.orm import Session
from baby_monitor.repositories.interfaces 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 DatabaseDiaperChangeRepository(DiaperChangeRepositoryInterface):
"""Database implementation for diaper change log data access.
Works with both SQLite and PostgreSQL databases.
"""
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,
}
@@ -0,0 +1,117 @@
"""Database-agnostic implementation of feeding repository.
Works with both SQLite and PostgreSQL.
"""
from datetime import datetime
from sqlalchemy.orm import Session
from baby_monitor.repositories.interfaces import (
FeedingRepositoryInterface,
)
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 DatabaseFeedingRepository(FeedingRepositoryInterface):
"""Database implementation for feeding log data access.
Works with both SQLite and PostgreSQL databases.
"""
def __init__(self, db: Session):
self.db = db
def create(
self,
child_id: int,
start_time: datetime,
feeding_type: str,
end_time: datetime | None = None,
) -> dict:
"""Create a new feeding log entry."""
feeding = Feeding(
child_id=child_id,
start_time=start_time,
end_time=end_time,
feeding_type=feeding_type,
)
self.db.add(feeding)
self.db.commit()
self.db.refresh(feeding)
return self._to_dict(feeding)
def get_by_id(self, feeding_id: int) -> dict | None:
"""Get a feeding log by ID."""
feeding = self.db.query(Feeding).filter(Feeding.id == feeding_id).first()
if not feeding:
return None
return self._to_dict(feeding)
def get_by_child_id(self, child_id: int) -> list[dict]:
"""Get all feeding logs for a specific child."""
feedings = (
self.db.query(Feeding)
.filter(Feeding.child_id == child_id)
.order_by(Feeding.start_time.desc())
.all()
)
return [self._to_dict(feeding) for feeding in feedings]
def get_by_user_id(self, user_id: int) -> list[dict]:
"""Get all feeding logs for a specific user's children."""
feedings = (
self.db.query(Feeding)
.join(Child, 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()
)
return [self._to_dict(feeding) for feeding in feedings]
def update(
self,
feeding_id: int,
start_time: datetime | None = None,
end_time: datetime | None = None,
feeding_type: str | None = None,
) -> dict | None:
"""Update a feeding log entry."""
feeding = self.db.query(Feeding).filter(Feeding.id == feeding_id).first()
if not feeding:
return None
if start_time is not None:
feeding.start_time = start_time # type: ignore[assignment]
if end_time is not None:
feeding.end_time = end_time # type: ignore[assignment]
if feeding_type is not None:
feeding.feeding_type = feeding_type # type: ignore[assignment]
self.db.commit()
self.db.refresh(feeding)
return self._to_dict(feeding)
def delete(self, feeding_id: int) -> bool:
"""Delete a feeding log entry."""
feeding = self.db.query(Feeding).filter(Feeding.id == feeding_id).first()
if not feeding:
return False
self.db.delete(feeding)
self.db.commit()
return True
def _to_dict(self, feeding: Feeding) -> dict:
"""Convert Feeding model to dictionary."""
return {
"id": feeding.id,
"child_id": feeding.child_id,
"start_time": feeding.start_time,
"end_time": feeding.end_time,
"feeding_type": feeding.feeding_type,
"created_at": feeding.created_at,
}
@@ -1,17 +1,41 @@
"""Repository interfaces package.""" """Repository interfaces package."""
from .child_invitation_interface import (
ChildInvitationRepositoryInterface,
)
from .credentials_repository_interface import ( from .credentials_repository_interface import (
CredentialsRepositoryInterface, CredentialsRepositoryInterface,
) )
from .invitation_repository_interface import (
InvitationRepositoryInterface,
)
from .token_repository_interface import ( from .token_repository_interface import (
TokenRepositoryInterface, TokenRepositoryInterface,
) )
from .user_repository_interface import ( from .user_repository_interface import (
UserRepositoryInterface, 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__ = [ __all__ = [
"UserRepositoryInterface", "ChildInvitationRepositoryInterface",
"TokenRepositoryInterface", "ChildRepositoryInterface",
"CredentialsRepositoryInterface", "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
@@ -0,0 +1,48 @@
"""Interface for child repository operations."""
from abc import ABC, abstractmethod
from datetime import datetime
class ChildRepositoryInterface(ABC):
"""Interface for child data access operations."""
@abstractmethod
def create(
self, name: str, birth_time: datetime, birth_weight: float, user_id: int
) -> dict:
"""Create a new child record."""
@abstractmethod
def get_by_id(self, child_id: int) -> dict | None:
"""Get a child by ID."""
@abstractmethod
def get_by_user_id(self, user_id: int) -> list[dict]:
"""Get all children for a specific user."""
@abstractmethod
def update(
self,
child_id: int,
name: str | None = None,
birth_time: datetime | None = None,
birth_weight: float | None = None,
) -> dict | None:
"""Update a child record."""
@abstractmethod
def delete(self, child_id: int) -> bool:
"""Delete a child record."""
@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,44 @@
"""Interface for feeding repository operations."""
from abc import ABC, abstractmethod
from datetime import datetime
class FeedingRepositoryInterface(ABC):
"""Interface for feeding log data access operations."""
@abstractmethod
def create(
self,
child_id: int,
start_time: datetime,
feeding_type: str,
end_time: datetime | None = None,
) -> dict:
"""Create a new feeding log entry."""
@abstractmethod
def get_by_id(self, feeding_id: int) -> dict | None:
"""Get a feeding log by ID."""
@abstractmethod
def get_by_child_id(self, child_id: int) -> list[dict]:
"""Get all feeding logs for a specific child."""
@abstractmethod
def get_by_user_id(self, user_id: int) -> list[dict]:
"""Get all feeding logs for a specific user's children."""
@abstractmethod
def update(
self,
feeding_id: int,
start_time: datetime | None = None,
end_time: datetime | None = None,
feeding_type: str | None = None,
) -> dict | None:
"""Update a feeding log entry."""
@abstractmethod
def delete(self, feeding_id: int) -> bool:
"""Delete a feeding log entry."""
@@ -0,0 +1,49 @@
"""Interface for invitation repository operations."""
from abc import ABC, abstractmethod
from datetime import datetime
class InvitationRepositoryInterface(ABC):
"""Interface for managing invitation tokens."""
@abstractmethod
def create_invitation(
self, token: str, created_by_user_id: int, expires_at: datetime
) -> None:
"""
Create a new invitation token.
Args:
token: The invitation token string
created_by_user_id: ID of the user creating the invitation
expires_at: Expiration datetime for the invitation
"""
@abstractmethod
def verify_invitation(self, token: str) -> bool:
"""
Verify if an invitation token is valid and not consumed.
Args:
token: The invitation token to verify
Returns:
True if valid and not consumed, False otherwise
"""
@abstractmethod
def consume_invitation(self, token: str) -> bool:
"""
Mark an invitation token as consumed.
Args:
token: The invitation token to consume
Returns:
True if successfully consumed, False if invalid or already used
"""
@abstractmethod
def cleanup_expired(self) -> None:
"""Remove expired invitation tokens from storage."""
@@ -0,0 +1,41 @@
"""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,
end_time: datetime | None = None,
) -> 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 @abstractmethod
def get_by_id(self, user_id: int) -> dict | None: def get_by_id(self, user_id: int) -> dict | None:
"""Get user by ID.""" """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,10 @@
"""Invitation repository implementations."""
from baby_monitor.repositories.invitation.sqlite_invitation import (
DatabaseInvitationRepository,
)
# Keep old name for backward compatibility
SQLiteInvitationRepository = DatabaseInvitationRepository
__all__ = ["DatabaseInvitationRepository", "SQLiteInvitationRepository"]
@@ -0,0 +1,144 @@
"""Database-agnostic implementation of invitation repository.
Supports both SQLite and PostgreSQL:
- SQLite: stores datetimes as naive UTC
- PostgreSQL: stores datetimes as timezone-aware
The repository automatically adapts by checking the timezone awareness
of datetimes returned from the database.
"""
from datetime import datetime, UTC
from sqlalchemy.orm import Session
from baby_monitor.models.invitation import Invitation
from baby_monitor.repositories.interfaces import (
InvitationRepositoryInterface,
)
class DatabaseInvitationRepository(InvitationRepositoryInterface):
"""Database implementation for managing invitation tokens.
Works with both SQLite and PostgreSQL databases.
"""
def __init__(self, db: Session) -> None:
"""Initialize the repository with a database session."""
self.db = db
def _get_now_utc(self, reference_dt: datetime) -> datetime:
"""
Get current UTC time matching the timezone awareness of reference.
Args:
reference_dt: A datetime from DB to match timezone format
Returns:
Current UTC time (naive for SQLite, aware for PostgreSQL)
"""
now = datetime.now(UTC)
if reference_dt.tzinfo is None:
# SQLite: return naive UTC
return now.replace(tzinfo=None)
# PostgreSQL: return timezone-aware
return now
def create_invitation(
self, token: str, created_by_user_id: int, expires_at: datetime
) -> None:
"""
Create a new invitation token.
Args:
token: The invitation token string
created_by_user_id: ID of the user creating the invitation
expires_at: Expiration datetime for the invitation
"""
# Convert timezone-aware datetimes to naive UTC for SQLite
created_at_utc = datetime.now(UTC).replace(tzinfo=None)
expires_at_utc = (
expires_at.replace(tzinfo=None) if expires_at.tzinfo else expires_at
)
invitation = Invitation(
token=token,
created_at=created_at_utc,
expires_at=expires_at_utc,
created_by_user_id=created_by_user_id,
is_consumed=False,
consumed_at=None,
)
self.db.add(invitation)
self.db.commit()
def verify_invitation(self, token: str) -> bool:
"""
Verify if an invitation token is valid and not consumed.
Args:
token: The invitation token to verify
Returns:
True if valid and not consumed, False otherwise
"""
invitation = self.db.query(Invitation).filter(Invitation.token == token).first()
if not invitation:
return False
# Get current time matching database timezone format
now_utc = self._get_now_utc(invitation.expires_at)
if invitation.expires_at < now_utc:
return False
# Check if already consumed
if invitation.is_consumed:
return False
return True
def consume_invitation(self, token: str) -> bool:
"""
Mark an invitation token as consumed.
Args:
token: The invitation token to consume
Returns:
True if successfully consumed, False if invalid or already used
"""
invitation = self.db.query(Invitation).filter(Invitation.token == token).first()
if not invitation:
return False
# Get current time matching database timezone format
now_utc = self._get_now_utc(invitation.expires_at)
if invitation.expires_at < now_utc:
return False
# Check if already consumed
if invitation.is_consumed:
return False
# Mark as consumed
invitation.is_consumed = True
invitation.consumed_at = now_utc
self.db.commit()
return True
def cleanup_expired(self) -> None:
"""Remove expired invitation tokens from storage."""
# For cleanup, we need to get a sample to determine format
# Get any invitation to check timezone format
sample = self.db.query(Invitation).first()
if sample:
now_utc = self._get_now_utc(sample.expires_at)
else:
# No invitations, use naive UTC (safe default)
now_utc = datetime.now(UTC).replace(tzinfo=None)
self.db.query(Invitation).filter(Invitation.expires_at < now_utc).delete()
self.db.commit()
@@ -0,0 +1,108 @@
"""Database-agnostic implementation of sleep repository.
Works with both SQLite and PostgreSQL.
"""
from datetime import datetime
from sqlalchemy.orm import Session
from baby_monitor.repositories.interfaces 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 DatabaseSleepRepository(SleepRepositoryInterface):
"""Database implementation for sleep log data access.
Works with both SQLite and PostgreSQL databases.
"""
def __init__(self, db: Session):
self.db = db
def create(
self,
child_id: int,
start_time: datetime,
end_time: datetime | None = None,
) -> dict:
"""Create a new sleep log entry."""
sleep = Sleep(
child_id=child_id,
start_time=start_time,
end_time=end_time,
)
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,
}
@@ -16,6 +16,7 @@ class InMemoryTokenRepository(TokenRepositoryInterface):
def __init__(self) -> None: def __init__(self) -> None:
# token -> (user_id, expiry_time) # token -> (user_id, expiry_time)
self._tokens: dict[str, tuple[int, datetime]] = {} self._tokens: dict[str, tuple[int, datetime]] = {}
self._default_ttl = 3600 # Store default TTL for sliding expiration
def store(self, token: str, user_id: int, ttl: int = 3600) -> None: def store(self, token: str, user_id: int, ttl: int = 3600) -> None:
"""Store a token with TTL (time to live in seconds).""" """Store a token with TTL (time to live in seconds)."""
@@ -23,7 +24,10 @@ class InMemoryTokenRepository(TokenRepositoryInterface):
self._tokens[token] = (user_id, expiry) self._tokens[token] = (user_id, expiry)
def verify(self, token: str) -> int | None: def verify(self, token: str) -> int | None:
"""Verify token and return user_id if valid, None otherwise.""" """Verify token and return user_id if valid, None otherwise.
Implements sliding expiration: extends token lifetime on each verification.
"""
if token not in self._tokens: if token not in self._tokens:
return None return None
@@ -34,6 +38,10 @@ class InMemoryTokenRepository(TokenRepositoryInterface):
del self._tokens[token] del self._tokens[token]
return None return None
# Sliding expiration: extend the token lifetime
new_expiry = datetime.now(UTC) + timedelta(seconds=self._default_ttl)
self._tokens[token] = (user_id, new_expiry)
return user_id return user_id
def invalidate(self, token: str) -> None: def invalidate(self, token: str) -> None:
@@ -42,7 +50,7 @@ class InMemoryTokenRepository(TokenRepositoryInterface):
def cleanup_expired(self) -> None: def cleanup_expired(self) -> None:
"""Remove expired tokens.""" """Remove expired tokens."""
now = datetime.utcnow() now = datetime.now(UTC)
expired_tokens = [ expired_tokens = [
token for token, (_, expiry) in self._tokens.items() if now > expiry token for token, (_, expiry) in self._tokens.items() if now > expiry
] ]
@@ -21,6 +21,7 @@ class RedisTokenRepository(TokenRepositoryInterface):
redis_client: Redis client instance from redis.from_url() redis_client: Redis client instance from redis.from_url()
""" """
self.redis = redis_client self.redis = redis_client
self.default_ttl = 3600 # Store default TTL for sliding expiration
def store(self, token: str, user_id: int, ttl: int = 3600) -> None: def store(self, token: str, user_id: int, ttl: int = 3600) -> None:
"""Store a token with TTL (time to live in seconds).""" """Store a token with TTL (time to live in seconds)."""
@@ -28,10 +29,15 @@ class RedisTokenRepository(TokenRepositoryInterface):
self.redis.setex(key, ttl, str(user_id)) self.redis.setex(key, ttl, str(user_id))
def verify(self, token: str) -> int | None: def verify(self, token: str) -> int | None:
"""Verify token and return user_id if valid, None otherwise.""" """Verify token and return user_id if valid, None otherwise.
Implements sliding expiration: extends token lifetime on verification.
"""
key = f"token:{token}" key = f"token:{token}"
user_id_str = self.redis.get(key) user_id_str = self.redis.get(key)
if user_id_str: if user_id_str:
# Sliding expiration: extend the token lifetime
self.redis.expire(key, self.default_ttl)
return int(user_id_str) return int(user_id_str)
return None return None
@@ -1,64 +0,0 @@
"""PostgreSQL user repository (future implementation)."""
from sqlalchemy.orm import Session
from baby_monitor.repositories.interfaces import UserRepositoryInterface
from baby_monitor.models.db.user import User
class PostgreSQLUserRepository(UserRepositoryInterface):
"""
PostgreSQL-based user repository.
This implementation uses the same SQLAlchemy models as SQLite,
just with a different database engine.
To use this implementation:
1. Add psycopg2-binary dependency
2. Update DATABASE_URL in database.py:
DATABASE_URL = os.getenv(
"DATABASE_URL",
"postgresql://user:password@localhost:5432/baby_monitor"
)
3. Replace SQLiteUserRepository with this in dependencies
"""
def __init__(self, db: Session):
self.db = db
def get_by_username(self, username: str) -> dict | None:
"""Get user by username."""
user = self.db.query(User).filter(User.username == username).first()
if user:
return {
"id": user.id,
"username": user.username,
"hashed_password": user.hashed_password,
"created_at": user.created_at,
}
return None
def create(self, username: str, hashed_password: str) -> dict:
"""Create a new user."""
user = User(username=username, hashed_password=hashed_password)
self.db.add(user)
self.db.commit()
self.db.refresh(user)
return {
"id": user.id,
"username": user.username,
"hashed_password": user.hashed_password,
"created_at": user.created_at,
}
def get_by_id(self, user_id: int) -> dict | None:
"""Get user by ID."""
user = self.db.query(User).filter(User.id == user_id).first()
if user:
return {
"id": user.id,
"username": user.username,
"hashed_password": user.hashed_password,
"created_at": user.created_at,
}
return None
@@ -1,4 +1,7 @@
"""SQLite implementation of user repository.""" """Database-agnostic implementation of user repository.
Works with both SQLite and PostgreSQL.
"""
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
@@ -6,8 +9,11 @@ from baby_monitor.repositories.interfaces import UserRepositoryInterface
from baby_monitor.models.db.user import User from baby_monitor.models.db.user import User
class SQLiteUserRepository(UserRepositoryInterface): class DatabaseUserRepository(UserRepositoryInterface):
"""SQLite-based user repository.""" """Database-based user repository.
Works with both SQLite and PostgreSQL databases.
"""
def __init__(self, db: Session): def __init__(self, db: Session):
self.db = db self.db = db
@@ -20,13 +26,18 @@ class SQLiteUserRepository(UserRepositoryInterface):
"id": user.id, "id": user.id,
"username": user.username, "username": user.username,
"hashed_password": user.hashed_password, "hashed_password": user.hashed_password,
"is_admin": user.is_admin,
"created_at": user.created_at, "created_at": user.created_at,
} }
return None return None
def create(self, username: str, hashed_password: str) -> dict: def create(self, username: str, hashed_password: str) -> dict:
"""Create a new user.""" """Create a new user."""
user = User(username=username, hashed_password=hashed_password) user = User(
username=username,
hashed_password=hashed_password,
is_admin=False,
)
self.db.add(user) self.db.add(user)
self.db.commit() self.db.commit()
self.db.refresh(user) self.db.refresh(user)
@@ -34,6 +45,7 @@ class SQLiteUserRepository(UserRepositoryInterface):
"id": user.id, "id": user.id,
"username": user.username, "username": user.username,
"hashed_password": user.hashed_password, "hashed_password": user.hashed_password,
"is_admin": user.is_admin,
"created_at": user.created_at, "created_at": user.created_at,
} }
@@ -45,6 +57,39 @@ class SQLiteUserRepository(UserRepositoryInterface):
"id": user.id, "id": user.id,
"username": user.username, "username": user.username,
"hashed_password": user.hashed_password, "hashed_password": user.hashed_password,
"is_admin": user.is_admin,
"created_at": user.created_at, "created_at": user.created_at,
} }
return None 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
+245
View File
@@ -0,0 +1,245 @@
"""Admin router for administrative functions."""
import secrets
from datetime import datetime, timedelta, UTC
from typing import Annotated
from fastapi import APIRouter, Depends, HTTPException
from pydantic import BaseModel
from baby_monitor.routers.auth import verify_admin
from baby_monitor.repositories.dependencies import (
get_invitation_repository,
get_user_repository,
get_child_repository,
get_feeding_repository,
get_diaper_change_repository,
get_sleep_repository,
)
from baby_monitor.repositories.interfaces import (
InvitationRepositoryInterface,
UserRepositoryInterface,
ChildRepositoryInterface,
FeedingRepositoryInterface,
DiaperChangeRepositoryInterface,
SleepRepositoryInterface,
)
router = APIRouter(prefix="/api/admin", tags=["admin"])
class InvitationResponse(BaseModel):
"""Response model for invitation link generation."""
token: str
expires_at: str
message: str
@router.post("/generate-invitation", response_model=InvitationResponse)
async def generate_invitation_link(
user_id: Annotated[int, Depends(verify_admin)],
invitation_repository: Annotated[
InvitationRepositoryInterface,
Depends(get_invitation_repository),
],
) -> InvitationResponse:
"""Generate a new invitation link for user registration.
The invitation token is valid for 24 hours and can be used once.
Requires admin role.
Args:
user_id: Admin user ID (from verify_admin)
invitation_repository: Invitation storage backend
Returns:
InvitationResponse with token and expiration details
"""
# Generate secure random token
invitation_token = secrets.token_urlsafe(32)
# Calculate expiration (24 hours from now)
expires_at = datetime.now(UTC) + timedelta(hours=24)
# Store invitation token in database
invitation_repository.create_invitation(
token=invitation_token,
created_by_user_id=user_id,
expires_at=expires_at,
)
return InvitationResponse(
token=invitation_token,
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,
)
+242 -19
View File
@@ -1,22 +1,46 @@
"""Authentication router for login and user management.""" """Authentication router for login and user management."""
import secrets import secrets
from fastapi import APIRouter, HTTPException, Depends, Header
from typing import Annotated from typing import Annotated
from fastapi import APIRouter, HTTPException, Depends, Header
from pydantic import BaseModel
from baby_monitor.models.auth import LoginRequest, LoginResponse from baby_monitor.models.auth import (
LoginRequest,
LoginResponse,
RegisterRequest,
RegisterResponse,
)
from baby_monitor.repositories import ( 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_token_repository,
get_credentials_repository, get_user_repository,
) )
from baby_monitor.repositories.interfaces import ( from baby_monitor.repositories.interfaces import (
TokenRepositoryInterface, TokenRepositoryInterface,
CredentialsRepositoryInterface, UserRepositoryInterface,
InvitationRepositoryInterface,
ChildRepositoryInterface,
FeedingRepositoryInterface,
DiaperChangeRepositoryInterface,
SleepRepositoryInterface,
) )
from baby_monitor.utils import hash_password, verify_password
router = APIRouter(prefix="/api", tags=["authentication"]) router = APIRouter(prefix="/api", tags=["authentication"])
class ChangePasswordRequest(BaseModel):
"""Request model for password change."""
current_password: str
new_password: str
def verify_token( def verify_token(
authorization: Annotated[str | None, Header()] = None, authorization: Annotated[str | None, Header()] = None,
token_repo: TokenRepositoryInterface = Depends(get_token_repository), token_repo: TokenRepositoryInterface = Depends(get_token_repository),
@@ -39,11 +63,27 @@ def verify_token(
return user_id return user_id
def verify_admin(
user_id: Annotated[int, Depends(verify_token)],
user_repo: Annotated[UserRepositoryInterface, Depends(get_user_repository)],
) -> int:
"""Verify the user is an admin and return user_id."""
user = user_repo.get_by_id(user_id)
if not user:
raise HTTPException(status_code=401, detail="User not found")
if not user.get("is_admin", False):
raise HTTPException(status_code=403, detail="Admin access required")
return user_id
@router.post("/login", response_model=LoginResponse) @router.post("/login", response_model=LoginResponse)
def login( def login(
credentials: LoginRequest, credentials: LoginRequest,
token_repo: TokenRepositoryInterface = Depends(get_token_repository), token_repo: Annotated[TokenRepositoryInterface, Depends(get_token_repository)],
creds_repo: CredentialsRepositoryInterface = Depends(get_credentials_repository), user_repo: Annotated[UserRepositoryInterface, Depends(get_user_repository)],
) -> LoginResponse: ) -> LoginResponse:
""" """
API endpoint for user authentication. API endpoint for user authentication.
@@ -51,21 +91,26 @@ def login(
Returns user info and access token on successful login. Returns user info and access token on successful login.
Raises 401 on invalid credentials. Raises 401 on invalid credentials.
""" """
# Verify credentials using repository # Check if user exists in database
if creds_repo.verify_admin_credentials(credentials.username, credentials.password): user = user_repo.get_by_username(credentials.username)
# Generate a secure random token if not user:
access_token = secrets.token_urlsafe(32)
# Store token with user_id (hardcoded 1 for now)
token_repo.store(access_token, user_id=1, ttl=3600)
return LoginResponse(
message="Login successful",
username=credentials.username,
access_token=access_token,
)
else:
raise HTTPException(status_code=401, detail="Invalid username or password") raise HTTPException(status_code=401, detail="Invalid username or password")
# Verify password using bcrypt
if not verify_password(credentials.password, user["hashed_password"]):
raise HTTPException(status_code=401, detail="Invalid username or password")
# Generate a secure random token
access_token = secrets.token_urlsafe(32)
token_repo.store(access_token, user_id=user["id"], ttl=3600)
return LoginResponse(
message="Login successful",
username=credentials.username,
access_token=access_token,
is_admin=user.get("is_admin", False),
)
@router.post("/logout") @router.post("/logout")
def logout( def logout(
@@ -76,3 +121,181 @@ def logout(
# Note: We'd need to pass the token itself, not user_id # Note: We'd need to pass the token itself, not user_id
# This is simplified - in production, extract token from verify_token # This is simplified - in production, extract token from verify_token
return {"message": "Logged out successfully"} return {"message": "Logged out successfully"}
@router.get("/verify-invitation")
def verify_invitation(
token: str,
invitation_repo: Annotated[
InvitationRepositoryInterface, Depends(get_invitation_repository)
],
) -> dict[str, bool]:
"""Verify if an invitation token is valid."""
is_valid = invitation_repo.verify_invitation(token)
if not is_valid:
raise HTTPException(status_code=400, detail="Invalid or expired invitation")
return {"valid": True}
@router.post("/register", response_model=RegisterResponse)
def register(
request: RegisterRequest,
user_repo: Annotated[UserRepositoryInterface, Depends(get_user_repository)],
invitation_repo: Annotated[
InvitationRepositoryInterface, Depends(get_invitation_repository)
],
token_repo: Annotated[TokenRepositoryInterface, Depends(get_token_repository)],
) -> RegisterResponse:
"""
Register a new user with an invitation token.
Verifies the invitation, creates the user, consumes the invitation,
and returns an authentication token.
"""
# Verify invitation token
if not invitation_repo.verify_invitation(request.invitation_token):
raise HTTPException(
status_code=400,
detail="Invalid or expired invitation token",
)
# Check if username already exists
existing_user = user_repo.get_by_username(request.username)
if existing_user:
raise HTTPException(
status_code=400,
detail="Username already exists",
)
# Create the new user with hashed password
hashed_pw = hash_password(request.password)
user = user_repo.create(
username=request.username,
hashed_password=hashed_pw,
)
# Consume the invitation token
invitation_repo.consume_invitation(request.invitation_token)
# Generate authentication token
access_token = secrets.token_urlsafe(32)
token_repo.store(access_token, user_id=user["id"], ttl=3600)
return RegisterResponse(
message="Registration successful",
username=user["username"],
access_token=access_token,
is_admin=user.get("is_admin", False),
)
@router.get("/me")
def get_current_user(
user_id: Annotated[int, Depends(verify_token)],
user_repo: Annotated[UserRepositoryInterface, Depends(get_user_repository)],
) -> dict:
"""Get current user info including admin status."""
user = user_repo.get_by_id(user_id)
if not user:
raise HTTPException(status_code=404, detail="User not found")
return {
"id": user["id"],
"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,
},
}
+231
View File
@@ -0,0 +1,231 @@
"""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
from baby_monitor.repositories.interfaces import (
ChildRepositoryInterface,
ChildInvitationRepositoryInterface,
UserRepositoryInterface,
)
from baby_monitor.repositories.dependencies import (
get_child_repository,
get_child_invitation_repository,
get_user_repository,
)
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,
user_id: Annotated[int, Depends(verify_token)],
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
) -> ChildResponse:
"""Create a new child for the authenticated user."""
child = child_repo.create(
name=request.name,
birth_time=request.birth_time,
birth_weight=request.birth_weight,
user_id=user_id,
)
return ChildResponse(**child)
@router.get("", response_model=list[ChildResponse])
def get_user_children(
user_id: Annotated[int, Depends(verify_token)],
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
user_repo: Annotated[UserRepositoryInterface, Depends(get_user_repository)],
) -> list[ChildResponse]:
"""Get all children for the authenticated user."""
children = child_repo.get_by_user_id(user_id)
# Add parent information to each child
result = []
for child in children:
child_data = child.copy()
parent_ids = child_repo.get_parent_ids(child["id"])
child_data["parent_count"] = len(parent_ids)
# Get usernames of all parents
parent_usernames = []
for parent_id in parent_ids:
parent = user_repo.get_by_id(parent_id)
if parent:
parent_usernames.append(parent["username"])
child_data["parent_usernames"] = parent_usernames
result.append(ChildResponse(**child_data))
return result
@router.get("/{child_id}", response_model=ChildResponse)
def get_child(
child_id: int,
user_id: Annotated[int, Depends(verify_token)],
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
) -> ChildResponse:
"""Get a specific child by ID."""
child = child_repo.get_by_id(child_id)
if not child:
raise HTTPException(status_code=404, detail="Child not found")
# Verify the child belongs to the authenticated user
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)
@router.put("/{child_id}", response_model=ChildResponse)
def update_child(
child_id: int,
request: CreateChildRequest,
user_id: Annotated[int, Depends(verify_token)],
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
) -> ChildResponse:
"""Update a child's information."""
# First check if child exists and belongs to user
child = child_repo.get_by_id(child_id)
if not child:
raise HTTPException(status_code=404, detail="Child not found")
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
updated_child = child_repo.update(
child_id=child_id,
name=request.name,
birth_time=request.birth_time,
birth_weight=request.birth_weight,
)
if not updated_child:
raise HTTPException(status_code=500, detail="Update failed")
return ChildResponse(**updated_child)
@router.post("/invitations", response_model=ChildInvitationResponse)
def create_child_invitation(
request: CreateChildInvitationRequest,
user_id: Annotated[int, Depends(verify_token)],
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
invitation_repo: Annotated[
ChildInvitationRepositoryInterface,
Depends(get_child_invitation_repository),
],
) -> 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[ChildRepositoryInterface, Depends(get_child_repository)],
invitation_repo: Annotated[
ChildInvitationRepositoryInterface,
Depends(get_child_invitation_repository),
],
) -> 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),
}
+141
View File
@@ -0,0 +1,141 @@
"""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.interfaces import (
DiaperChangeRepositoryInterface,
ChildRepositoryInterface,
)
from baby_monitor.repositories.dependencies import (
get_diaper_change_repository,
get_child_repository,
)
from baby_monitor.utils.verify_child_access 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[
DiaperChangeRepositoryInterface, Depends(get_diaper_change_repository)
],
child_repo: Annotated[ChildRepositoryInterface, 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[
DiaperChangeRepositoryInterface, 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[
DiaperChangeRepositoryInterface, Depends(get_diaper_change_repository)
],
child_repo: Annotated[ChildRepositoryInterface, 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[
DiaperChangeRepositoryInterface, Depends(get_diaper_change_repository)
],
child_repo: Annotated[ChildRepositoryInterface, 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[
DiaperChangeRepositoryInterface, Depends(get_diaper_change_repository)
],
child_repo: Annotated[ChildRepositoryInterface, 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"
)
+159
View File
@@ -0,0 +1,159 @@
"""Feeding log management router."""
from typing import Annotated
from fastapi import APIRouter, HTTPException, Depends
from baby_monitor.models.feeding import (
CreateFeedingRequest,
UpdateFeedingRequest,
FeedingResponse,
)
from baby_monitor.routers.auth import verify_token
from baby_monitor.repositories.interfaces import (
ChildRepositoryInterface,
FeedingRepositoryInterface,
)
from baby_monitor.repositories.dependencies import (
get_feeding_repository,
get_child_repository,
)
from baby_monitor.utils import verify_child_access
router = APIRouter(prefix="/api/feedings", tags=["feedings"])
@router.post("", response_model=FeedingResponse, status_code=201)
def create_feeding(
request: CreateFeedingRequest,
user_id: Annotated[int, Depends(verify_token)],
feeding_repo: Annotated[
FeedingRepositoryInterface, Depends(get_feeding_repository)
],
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
) -> FeedingResponse:
"""Create a new feeding log entry."""
# Verify the child belongs to the authenticated user
verify_child_access(child_repo, request.child_id, user_id)
feeding = feeding_repo.create(
child_id=request.child_id,
start_time=request.start_time,
end_time=request.end_time,
feeding_type=request.feeding_type.value,
)
return FeedingResponse(**feeding)
@router.get("/active", response_model=FeedingResponse | None)
def get_active_feeding(
user_id: Annotated[int, Depends(verify_token)],
feeding_repo: Annotated[
FeedingRepositoryInterface, Depends(get_feeding_repository)
],
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
) -> FeedingResponse | None:
"""Get the current active feeding (where end_time is null) for the user."""
feedings = feeding_repo.get_by_user_id(user_id)
# Find the first feeding with no end_time
for feeding in feedings:
if feeding["end_time"] is None:
# Get child info to include in response
child = child_repo.get_by_id(feeding["child_id"])
response_data = feeding.copy()
if child:
response_data["child_name"] = child["name"]
return FeedingResponse(**response_data)
return None
@router.get("", response_model=list[FeedingResponse])
def get_user_feedings(
user_id: Annotated[int, Depends(verify_token)],
feeding_repo: Annotated[
FeedingRepositoryInterface, Depends(get_feeding_repository)
],
) -> list[FeedingResponse]:
"""Get all feeding logs for the authenticated user's children."""
feedings = feeding_repo.get_by_user_id(user_id)
return [FeedingResponse(**feeding) for feeding in feedings]
@router.get("/{feeding_id}", response_model=FeedingResponse)
def get_feeding(
feeding_id: int,
user_id: Annotated[int, Depends(verify_token)],
feeding_repo: Annotated[
FeedingRepositoryInterface, Depends(get_feeding_repository)
],
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
) -> FeedingResponse:
"""Get a specific feeding log by ID."""
feeding = feeding_repo.get_by_id(feeding_id)
if not feeding:
raise HTTPException(status_code=404, detail="Feeding log not found")
# Verify the feeding belongs to user's child
verify_child_access(child_repo, feeding["child_id"], user_id)
return FeedingResponse(**feeding)
@router.put("/{feeding_id}", response_model=FeedingResponse)
def update_feeding(
feeding_id: int,
request: UpdateFeedingRequest,
user_id: Annotated[int, Depends(verify_token)],
feeding_repo: Annotated[
FeedingRepositoryInterface, Depends(get_feeding_repository)
],
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
) -> FeedingResponse:
"""Update a feeding log entry."""
feeding = feeding_repo.get_by_id(feeding_id)
if not feeding:
raise HTTPException(status_code=404, detail="Feeding log not found")
# Verify ownership
verify_child_access(child_repo, feeding["child_id"], user_id)
# Update the feeding
feeding_type_value = request.feeding_type.value if request.feeding_type else None
updated_feeding = feeding_repo.update(
feeding_id=feeding_id,
start_time=request.start_time,
end_time=request.end_time,
feeding_type=feeding_type_value,
)
if not updated_feeding:
raise HTTPException(status_code=500, detail="Update failed")
return FeedingResponse(**updated_feeding)
@router.delete("/{feeding_id}", status_code=204)
def delete_feeding(
feeding_id: int,
user_id: Annotated[int, Depends(verify_token)],
feeding_repo: Annotated[
FeedingRepositoryInterface, Depends(get_feeding_repository)
],
child_repo: Annotated[ChildRepositoryInterface, Depends(get_child_repository)],
) -> None:
"""Delete a feeding log entry."""
feeding = feeding_repo.get_by_id(feeding_id)
if not feeding:
raise HTTPException(status_code=404, detail="Feeding log not found")
# Verify ownership
verify_child_access(child_repo, feeding["child_id"], user_id)
success = feeding_repo.delete(feeding_id)
if not success:
raise HTTPException(status_code=500, detail="Delete failed")
+142
View File
@@ -0,0 +1,142 @@
"""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.interfaces import (
SleepRepositoryInterface,
ChildRepositoryInterface,
)
from baby_monitor.repositories.dependencies import (
get_sleep_repository,
get_child_repository,
)
from baby_monitor.utils 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[SleepRepositoryInterface, Depends(get_sleep_repository)],
child_repo: Annotated[ChildRepositoryInterface, 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,
end_time=request.end_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[SleepRepositoryInterface, Depends(get_sleep_repository)],
child_repo: Annotated[ChildRepositoryInterface, 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[SleepRepositoryInterface, 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[SleepRepositoryInterface, Depends(get_sleep_repository)],
child_repo: Annotated[ChildRepositoryInterface, 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[SleepRepositoryInterface, Depends(get_sleep_repository)],
child_repo: Annotated[ChildRepositoryInterface, 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[SleepRepositoryInterface, Depends(get_sleep_repository)],
child_repo: Annotated[ChildRepositoryInterface, 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")
+350
View File
@@ -0,0 +1,350 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Add Child - Baby Monitor</title>
<style>
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}
body {
font-family:
-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
Cantarell, sans-serif;
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
min-height: 100vh;
display: flex;
justify-content: center;
align-items: center;
padding: 20px;
}
.container {
background: white;
border-radius: 12px;
box-shadow: 0 10px 40px rgba(0, 0, 0, 0.2);
padding: 40px;
max-width: 500px;
width: 100%;
}
h1 {
color: #333;
margin-bottom: 10px;
font-size: 28px;
}
.subtitle {
color: #666;
margin-bottom: 30px;
font-size: 14px;
}
.form-group {
margin-bottom: 20px;
}
label {
display: block;
margin-bottom: 8px;
color: #333;
font-weight: 600;
font-size: 14px;
}
input {
width: 100%;
padding: 12px;
border: 1px solid #ddd;
border-radius: 6px;
font-size: 14px;
transition: border-color 0.2s;
}
input:focus {
outline: none;
border-color: #667eea;
}
.button {
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
color: white;
border: none;
padding: 12px 24px;
border-radius: 6px;
font-size: 16px;
font-weight: 600;
cursor: pointer;
transition:
transform 0.2s,
box-shadow 0.2s;
width: 100%;
margin-top: 10px;
}
.button:hover {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(102, 126, 234, 0.4);
}
.button:active {
transform: translateY(0);
}
.button:disabled {
opacity: 0.6;
cursor: not-allowed;
transform: none;
}
.button.secondary {
background: #6c757d;
margin-top: 10px;
}
.button.secondary:hover {
box-shadow: 0 4px 12px rgba(108, 117, 125, 0.4);
}
.message {
padding: 12px;
border-radius: 6px;
margin-bottom: 20px;
display: none;
}
.message.show {
display: block;
}
.message.error {
background: #ffebee;
border-left: 4px solid #f44336;
color: #c62828;
}
.message.success {
background: #e8f5e9;
border-left: 4px solid #4caf50;
color: #2e7d32;
}
.help-text {
font-size: 12px;
color: #666;
margin-top: 4px;
}
</style>
</head>
<body>
<div class="container">
<h1>👶 Add Child</h1>
<p class="subtitle">Enter your child's information</p>
<div id="message" class="message"></div>
<form id="addChildForm">
<div class="form-group">
<label for="name">Child's Name *</label>
<input
type="text"
id="name"
name="name"
required
placeholder="Enter child's name"
maxlength="100"
/>
</div>
<div class="form-group">
<label for="birthTime">Date and Time of Birth *</label>
<input
type="datetime-local"
id="birthTime"
name="birthTime"
required
/>
<p class="help-text">
Select the date and time when your child was born
</p>
</div>
<div class="form-group">
<label for="birthWeight">Birth Weight (grams) *</label>
<input
type="number"
id="birthWeight"
name="birthWeight"
required
min="1"
step="1"
placeholder="e.g., 3500"
/>
<p class="help-text">Enter weight in grams (1 kg = 1000 grams)</p>
</div>
<button type="submit" class="button" id="submitBtn">Add Child</button>
<button type="button" class="button secondary" onclick="goBack()">
Cancel
</button>
</form>
<div
id="skipOption"
style="text-align: center; margin-top: 20px; display: none"
>
<p style="color: #666; font-size: 14px; margin-bottom: 10px">
Want to accept a child share invitation first?
</p>
<button
type="button"
class="button secondary"
onclick="skipToHome()"
style="margin: 0"
>
Skip for now
</button>
</div>
</div>
<script>
// Check if user is authenticated
const token = localStorage.getItem("access_token");
if (!token) {
window.location.href = "/login.html";
}
// Get child ID from URL if editing
const urlParams = new URLSearchParams(window.location.search);
const childId = urlParams.get("id");
const isEditMode = !!childId;
const fromHome = urlParams.get("from") === "home"; // Check if redirected from home
const form = document.getElementById("addChildForm");
const messageDiv = document.getElementById("message");
const submitBtn = document.getElementById("submitBtn");
// Show skip option if user was redirected from home (has no children)
if (fromHome && !isEditMode) {
document.getElementById("skipOption").style.display = "block";
}
// Update page title and button text if editing
if (isEditMode) {
document.querySelector("h1").textContent = "✏️ Edit Child";
document.querySelector(".subtitle").textContent =
"Update your child's information";
submitBtn.textContent = "Update Child";
// Load existing child data
loadChildData(childId);
}
async function loadChildData(id) {
try {
const response = await fetch(`/api/children/${id}`, {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (response.ok) {
const child = await response.json();
// Populate form fields
document.getElementById("name").value = child.name;
// Format datetime for datetime-local input
const birthDate = new Date(child.birth_time);
const formattedDate = birthDate.toISOString().slice(0, 16);
document.getElementById("birthTime").value = formattedDate;
document.getElementById("birthWeight").value = child.birth_weight;
} else {
showMessage("Failed to load child data", "error");
}
} catch (error) {
showMessage("Error loading child data", "error");
}
}
form.addEventListener("submit", async (e) => {
e.preventDefault();
const name = document.getElementById("name").value;
const birthTime = document.getElementById("birthTime").value;
const birthWeight = parseFloat(
document.getElementById("birthWeight").value,
);
// Disable button during request
submitBtn.disabled = true;
const originalText = submitBtn.textContent;
submitBtn.textContent = isEditMode ? "Updating..." : "Adding...";
messageDiv.classList.remove("show");
try {
const url = isEditMode ? `/api/children/${childId}` : "/api/children";
const method = isEditMode ? "PUT" : "POST";
const response = await fetch(url, {
method: method,
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${token}`,
},
body: JSON.stringify({
name: name,
birth_time: birthTime,
birth_weight: birthWeight,
}),
});
const data = await response.json();
if (response.ok) {
showMessage(
isEditMode
? "Child updated successfully!"
: "Child added successfully!",
"success",
);
// Redirect to settings page if editing, otherwise home page
setTimeout(() => {
window.location.href = isEditMode ? "/settings.html" : "/";
}, 1000);
} else {
showMessage(
data.detail ||
`Failed to ${isEditMode ? "update" : "add"} child. Please try again.`,
"error",
);
}
} catch (error) {
showMessage("Network error. Please try again.", "error");
} finally {
submitBtn.disabled = false;
submitBtn.textContent = originalText;
}
});
function showMessage(text, type) {
messageDiv.textContent = text;
messageDiv.className = `message ${type} show`;
}
function goBack() {
// Redirect to settings page if editing, otherwise home page
window.location.href = isEditMode ? "/settings.html" : "/";
}
function skipToHome() {
window.location.href = "/";
}
</script>
</body>
</html>
+667
View File
@@ -0,0 +1,667 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Baby Monitor - Admin</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: 600px;
width: 100%;
}
h1 {
color: #333;
margin-bottom: 10px;
font-size: 28px;
}
.subtitle {
color: #666;
margin-bottom: 30px;
font-size: 14px;
}
.section {
margin-bottom: 30px;
}
.section h2 {
color: #444;
font-size: 18px;
margin-bottom: 15px;
display: flex;
align-items: center;
}
.section h2::before {
content: "🔗";
margin-right: 8px;
}
.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%;
}
.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;
}
.link-container {
display: none;
margin-top: 20px;
padding: 15px;
background: #f8f9fa;
border-radius: 8px;
border: 2px solid #667eea;
}
.link-container.show {
display: block;
}
.link-label {
font-size: 12px;
color: #666;
margin-bottom: 8px;
font-weight: 600;
text-transform: uppercase;
}
.link-display {
display: flex;
gap: 10px;
align-items: center;
}
.link-text {
flex: 1;
padding: 10px;
background: white;
border: 1px solid #ddd;
border-radius: 4px;
font-family: "Courier New", monospace;
font-size: 13px;
word-break: break-all;
color: #333;
}
.copy-button {
padding: 10px 16px;
background: #28a745;
color: white;
border: none;
border-radius: 4px;
cursor: pointer;
font-weight: 600;
transition: background 0.2s;
white-space: nowrap;
}
.copy-button:hover {
background: #218838;
}
.copy-button.copied {
background: #155724;
}
.info-box {
background: #e7f3ff;
border-left: 4px solid #2196f3;
padding: 12px;
border-radius: 4px;
margin-top: 15px;
font-size: 14px;
color: #555;
}
.error {
background: #ffebee;
border-left: 4px solid #f44336;
color: #c62828;
padding: 12px;
border-radius: 4px;
margin-top: 15px;
display: none;
}
.error.show {
display: block;
}
.logout-button {
background: #dc3545;
padding: 8px 16px;
font-size: 14px;
margin-top: 20px;
}
.logout-button:hover {
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>
<div class="container">
<h1>👨‍💼 Admin Dashboard</h1>
<p class="subtitle">Manage user invitations and settings</p>
<div class="section">
<h2>Generate Invitation Link</h2>
<p style="color: #666; margin-bottom: 15px; font-size: 14px">
Create a secure one-time link to invite a new user to register.
</p>
<button class="button" id="generateBtn" onclick="generateLink()">
Generate New Invitation Link
</button>
<div id="linkContainer" class="link-container">
<div class="link-label">Invitation Link</div>
<div class="link-display">
<div class="link-text" id="linkText"></div>
<button class="copy-button" id="copyBtn" onclick="copyLink()">
Copy
</button>
</div>
<div class="info-box">
️ This link expires in 24 hours and can only be used once. Share it
securely with the intended user.
</div>
</div>
<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");
if (!token) {
window.location.href = "/login.html";
}
let allUsers = [];
let userToDelete = null;
// Verify user is admin and load data
fetch("/api/me", {
headers: {
Authorization: `Bearer ${token}`,
},
})
.then((response) => response.json())
.then((user) => {
if (!user.is_admin) {
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");
const linkText = document.getElementById("linkText");
const errorDiv = document.getElementById("error");
// Disable button and show loading state
btn.disabled = true;
btn.textContent = "Generating...";
errorDiv.classList.remove("show");
try {
const response = await fetch("/api/admin/generate-invitation", {
method: "POST",
headers: {
Authorization: `Bearer ${token}`,
"Content-Type": "application/json",
},
});
if (!response.ok) {
throw new Error(`Failed to generate link: ${response.statusText}`);
}
const data = await response.json();
// Build the full URL
const baseUrl = window.location.origin;
const inviteUrl = `${baseUrl}/register.html?token=${data.token}`;
// Display the link
linkText.textContent = inviteUrl;
linkContainer.classList.add("show");
} catch (error) {
errorDiv.textContent = `Error: ${error.message}`;
errorDiv.classList.add("show");
} finally {
btn.disabled = false;
btn.textContent = "Generate New Invitation Link";
}
}
function copyLink() {
const linkText = document.getElementById("linkText").textContent;
const copyBtn = document.getElementById("copyBtn");
navigator.clipboard
.writeText(linkText)
.then(() => {
// Show success state
copyBtn.textContent = "✓ Copied!";
copyBtn.classList.add("copied");
// Reset after 2 seconds
setTimeout(() => {
copyBtn.textContent = "Copy";
copyBtn.classList.remove("copied");
}, 2000);
})
.catch((err) => {
alert("Failed to copy link: " + err);
});
}
function logout() {
localStorage.removeItem("access_token");
window.location.href = "/login.html";
}
</script>
</body>
</html>
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+714 -25
View File
@@ -3,7 +3,8 @@
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Baby Monitor - Home</title> <title>Baby Monitor</title>
<link rel="stylesheet" href="/menu.css" />
<style> <style>
body { body {
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
@@ -22,11 +23,10 @@
color: #333; color: #333;
margin-bottom: 1rem; margin-bottom: 1rem;
} }
.user-info { .greeting {
background: #e3f2fd; color: #666;
padding: 1rem; font-size: 1.1rem;
border-radius: 4px; margin-bottom: 2rem;
margin-bottom: 1rem;
} }
button { button {
padding: 0.75rem 1.5rem; padding: 0.75rem 1.5rem;
@@ -36,14 +36,137 @@
border-radius: 4px; border-radius: 4px;
cursor: pointer; cursor: pointer;
font-size: 1rem; font-size: 1rem;
margin-right: 0.5rem;
} }
button:hover { button:hover {
background-color: #c82333; background-color: #c82333;
} }
.admin-button {
background-color: #667eea;
}
.admin-button:hover {
background-color: #5568d3;
}
.hidden {
display: none;
}
.loading { .loading {
text-align: center; text-align: center;
padding: 2rem; padding: 2rem;
} }
.feeding-button {
width: 100%;
padding: 2rem;
font-size: 1.5rem;
margin-bottom: 1.5rem;
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
border-radius: 8px;
transition:
transform 0.2s,
box-shadow 0.2s;
}
.feeding-button:hover {
transform: translateY(-2px);
box-shadow: 0 6px 20px rgba(102, 126, 234, 0.4);
background: linear-gradient(135deg, #764ba2 0%, #667eea 100%);
}
.feeding-button.active {
background: linear-gradient(135deg, #f44336 0%, #e91e63 100%);
}
.feeding-button.active:hover {
background: linear-gradient(135deg, #e91e63 0%, #f44336 100%);
}
.feeding-info {
font-size: 0.9rem;
margin-top: 0.5rem;
opacity: 0.9;
}
.modal {
display: none;
position: fixed;
top: 0;
left: 0;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, 0.5);
z-index: 1001;
justify-content: center;
align-items: center;
}
.modal.show {
display: flex;
}
.modal-content {
background: white;
padding: 2rem;
border-radius: 8px;
max-width: 400px;
width: 90%;
box-shadow: 0 10px 40px rgba(0, 0, 0, 0.3);
}
.modal h2 {
margin-top: 0;
margin-bottom: 1.5rem;
color: #333;
}
.form-group {
margin-bottom: 1rem;
}
.form-group label {
display: block;
margin-bottom: 0.5rem;
color: #333;
font-weight: 600;
}
.form-group select {
width: 100%;
padding: 0.75rem;
border: 1px solid #ddd;
border-radius: 4px;
font-size: 1rem;
}
.modal-buttons {
display: flex;
gap: 0.5rem;
margin-top: 1.5rem;
}
.modal-buttons button {
flex: 1;
margin: 0;
}
.cancel-button {
background-color: #6c757d;
}
.cancel-button:hover {
background-color: #5a6268;
}
.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> </style>
</head> </head>
<body> <body>
@@ -53,16 +176,76 @@
</div> </div>
</div> </div>
<!-- Start Feeding Modal -->
<div class="modal" id="startFeedingModal">
<div class="modal-content">
<h2>🍼 Start Feeding</h2>
<form id="startFeedingForm">
<div class="form-group">
<label for="modalChildId">Child</label>
<select id="modalChildId" required>
<option value="">Select a child</option>
</select>
</div>
<div class="form-group">
<label for="modalFeedingType">Feeding Type</label>
<select id="modalFeedingType" required>
<option value="">Select type</option>
<option value="left_breast">Left Breast</option>
<option value="right_breast">Right Breast</option>
<option value="bottle">Bottle</option>
</select>
</div>
<div class="modal-buttons">
<button
type="button"
class="cancel-button"
onclick="closeStartFeedingModal()"
>
Cancel
</button>
<button type="submit">Start</button>
</div>
</form>
</div>
</div>
<!-- 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> <script>
const token = localStorage.getItem("access_token"); const token = localStorage.getItem("access_token");
const username = localStorage.getItem("username"); const username = localStorage.getItem("username");
// Check if user is logged in // Check if user is logged in
if (!token) { if (!token) {
window.location.href = "/static/login.html"; window.location.href = "/login.html";
} else { } else {
// Verify token by making an authenticated request // Fetch current user info including admin status
fetch("/api/", { fetch("/api/me", {
headers: { headers: {
Authorization: `Bearer ${token}`, Authorization: `Bearer ${token}`,
}, },
@@ -74,31 +257,537 @@
// Token invalid, redirect to login // Token invalid, redirect to login
localStorage.removeItem("access_token"); localStorage.removeItem("access_token");
localStorage.removeItem("username"); localStorage.removeItem("username");
window.location.href = "/static/login.html"; window.location.href = "/login.html";
throw new Error("Authentication failed"); throw new Error("Authentication failed");
} }
}) })
.then((data) => { .then((user) => {
// Show authenticated content // Initialize burger menu
document.getElementById("content").innerHTML = ` initBurgerMenu({
<h1>Welcome to Baby Monitor!</h1> includeHome: true,
<div class="user-info"> });
<p><strong>Logged in as:</strong> ${username}</p>
</div>
<p>${data.message}</p>
<button id="logoutBtn">Logout</button>
`;
// Add logout handler // Check if user has any children
document return fetch("/api/children", {
.getElementById("logoutBtn") headers: {
.addEventListener("click", logout); Authorization: `Bearer ${token}`,
},
})
.then((response) => response.json())
.then((children) => {
// If no children, show welcome message with option to add
if (children.length === 0) {
showNoChildrenMessage();
return;
}
// Load feeding status and show content
loadFeedingStatus(children);
});
}) })
.catch((error) => { .catch((error) => {
console.error("Error:", error); console.error("Error:", error);
}); });
} }
function showNoChildrenMessage() {
const content = document.getElementById("content");
content.className = "";
content.innerHTML = `
<h1>👶 Welcome to Baby Monitor</h1>
<div style="text-align: center; padding: 40px 20px;">
<div style="font-size: 64px; margin-bottom: 20px;">🍼</div>
<h2 style="color: #333; margin-bottom: 15px;">No Children Added Yet</h2>
<p style="color: #666; margin-bottom: 30px; line-height: 1.6;">
You can add a child to start tracking or redeem a child share code<br>
from another user to access their child's information.
</p>
<div style="display: flex; gap: 15px; justify-content: center; flex-wrap: wrap;">
<a href="/add-child.html" class="button" style="text-decoration: none; display: inline-block;">
Add Your Child
</a>
<a href="/settings.html" class="button secondary" style="text-decoration: none; display: inline-block;">
🔗 Redeem Share Code
</a>
</div>
</div>
`;
}
let activeFeeding = null;
let userChildren = [];
let lastFeeding = null;
let updateTimerInterval = null;
let activeSleep = null;
let lastSleep = null;
let sleepUpdateTimerInterval = null;
async function loadFeedingStatus(children) {
userChildren = children;
try {
// Fetch active feeding
const activeResponse = await fetch("/api/feedings/active", {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (activeResponse.ok) {
activeFeeding = await activeResponse.json();
}
// Fetch all feedings to get the last one
const feedingsResponse = await fetch("/api/feedings", {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (feedingsResponse.ok) {
const feedings = await feedingsResponse.json();
if (feedings.length > 0) {
// Feedings are ordered by start_time desc, so first is most recent
lastFeeding = feedings[0];
}
}
// 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() {
// Clear any existing timer
if (updateTimerInterval) {
clearInterval(updateTimerInterval);
}
// Update every 30 seconds if there's an active feeding
if (activeFeeding) {
updateTimerInterval = setInterval(() => {
if (activeFeeding) {
updateFeedingTimeDisplay();
} else {
clearInterval(updateTimerInterval);
updateTimerInterval = null;
}
}, 30000); // Update every 30 seconds
}
}
function 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) {
timeElement.textContent = formatTime(activeFeeding.start_time);
}
}
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()">
🛑 Stopped Feeding
<div class="feeding-info">
${activeFeeding.child_name || "Child"} - ${formatFeedingType(activeFeeding.feeding_type)}<br>
Started <span id="feedingTimeInfo">${formatTime(activeFeeding.start_time)}</span>
</div>
</button>
`
: `
<button class="feeding-button" onclick="showStartFeedingModal()">
🍼 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>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}
${sleepButtonHtml}
`;
}
function formatFeedingType(type) {
const types = {
left_breast: "Left Breast",
right_breast: "Right Breast",
bottle: "Bottle",
};
return types[type] || type;
}
function formatTime(dateString) {
const date = new Date(dateString);
const now = new Date();
const diffMs = now - date;
const diffMins = Math.floor(diffMs / 60000);
if (diffMins < 1) return "just now";
if (diffMins < 60) return `${diffMins} min ago`;
const diffHours = Math.floor(diffMins / 60);
if (diffHours < 24) return `${diffHours}h ${diffMins % 60}m ago`;
return date.toLocaleString();
}
function showStartFeedingModal() {
const modal = document.getElementById("startFeedingModal");
const childSelect = document.getElementById("modalChildId");
const typeSelect = document.getElementById("modalFeedingType");
// Clear and populate child select or show single child
if (userChildren.length === 1) {
// Single child: replace dropdown with text display
const child = userChildren[0];
const formGroup = childSelect.parentElement;
formGroup.innerHTML = `
<label for="modalChildName">Child</label>
<input
type="text"
id="modalChildName"
value="${child.name}"
readonly
style="background-color: #f5f5f5; cursor: default;"
/>
<input type="hidden" id="modalChildId" value="${child.id}" />
`;
} else {
// Multiple children: show dropdown
childSelect.innerHTML = '<option value="">Select a child</option>';
userChildren.forEach((child) => {
const option = document.createElement("option");
option.value = child.id;
option.textContent = child.name;
childSelect.appendChild(option);
});
// Set defaults based on last feeding
if (lastFeeding) {
childSelect.value = lastFeeding.child_id;
}
}
// Set default feeding type based on last feeding
if (lastFeeding) {
typeSelect.value = lastFeeding.feeding_type;
}
modal.classList.add("show");
}
function closeStartFeedingModal() {
const modal = document.getElementById("startFeedingModal");
modal.classList.remove("show");
document.getElementById("startFeedingForm").reset();
}
document
.getElementById("startFeedingForm")
.addEventListener("submit", async (e) => {
e.preventDefault();
const childId = parseInt(
document.getElementById("modalChildId").value,
);
const feedingType = document.getElementById("modalFeedingType").value;
try {
const now = new Date();
const localDateTime = new Date(
now.getTime() - now.getTimezoneOffset() * 60000,
)
.toISOString()
.slice(0, 19);
const response = await fetch("/api/feedings", {
method: "POST",
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${token}`,
},
body: JSON.stringify({
child_id: childId,
start_time: localDateTime,
end_time: null,
feeding_type: feedingType,
}),
});
if (response.ok) {
const feeding = await response.json();
activeFeeding = feeding;
lastFeeding = feeding; // Update last feeding
// Add child name to active feeding
const child = userChildren.find((c) => c.id === childId);
if (child) {
activeFeeding.child_name = child.name;
}
closeStartFeedingModal();
renderContent();
startUpdateTimer(); // Start the timer for live updates
} else {
const data = await response.json();
alert(data.detail || "Failed to start feeding");
}
} catch (error) {
console.error("Error starting feeding:", error);
alert("Network error. Please try again.");
}
});
async function stopFeeding() {
if (!activeFeeding) return;
try {
const now = new Date();
const localDateTime = new Date(
now.getTime() - now.getTimezoneOffset() * 60000,
)
.toISOString()
.slice(0, 19);
const response = await fetch(`/api/feedings/${activeFeeding.id}`, {
method: "PUT",
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${token}`,
},
body: JSON.stringify({
end_time: localDateTime,
}),
});
if (response.ok) {
activeFeeding = null;
if (updateTimerInterval) {
clearInterval(updateTimerInterval);
updateTimerInterval = null;
}
renderContent();
} else {
const data = await response.json();
alert(data.detail || "Failed to stop feeding");
}
} catch (error) {
console.error("Error stopping feeding:", error);
alert("Network error. Please try again.");
}
}
function showStartSleepModal() {
const modal = document.getElementById("startSleepModal");
const childSelect = document.getElementById("modalSleepChildId");
// Clear and populate child select or show single child
if (userChildren.length === 1) {
// Single child: replace dropdown with text display
const child = userChildren[0];
const formGroup = childSelect.parentElement;
formGroup.innerHTML = `
<label for="modalSleepChildName">Child</label>
<input
type="text"
id="modalSleepChildName"
value="${child.name}"
readonly
style="background-color: #f5f5f5; cursor: default;"
/>
<input type="hidden" id="modalSleepChildId" value="${child.id}" />
`;
} else {
// Multiple children: show dropdown
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() { async function logout() {
const token = localStorage.getItem("access_token"); const token = localStorage.getItem("access_token");
@@ -115,7 +804,7 @@
// Clear local storage and redirect // Clear local storage and redirect
localStorage.removeItem("access_token"); localStorage.removeItem("access_token");
localStorage.removeItem("username"); localStorage.removeItem("username");
window.location.href = "/static/login.html"; window.location.href = "/login.html";
} }
} }
</script> </script>
+499
View File
@@ -0,0 +1,499 @@
<!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=getReturnUrl()"
>
Cancel
</button>
</form>
</div>
<script>
// Check if user is authenticated
const token = localStorage.getItem("access_token");
if (!token) {
window.location.href = "/login.html";
}
// Determine return URL based on referrer
function getReturnUrl() {
const referrer = document.referrer;
if (referrer.includes("/diapers.html")) {
return "/diapers.html";
}
// Default to home page
return "/";
}
// 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");
// Populate select dropdown or show single child
if (children.length === 1) {
// Single child: replace dropdown with text display
const child = children[0];
const formGroup = select.parentElement;
formGroup.innerHTML = `
<label for="childName">Child *</label>
<input
type="text"
id="childName"
value="${child.name}"
readonly
style="background-color: #f5f5f5; cursor: default;"
/>
<input type="hidden" id="childSelect" name="childSelect" value="${child.id}" />
`;
} else {
// Multiple children: show dropdown (clear the placeholder first)
select.innerHTML = "";
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 (only for multiple children)
if (children.length > 1) {
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 = getReturnUrl();
}, 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>
+430
View File
@@ -0,0 +1,430 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Log Feeding - Baby Monitor</title>
<style>
* {
margin: 0;
padding: 0;
box-sizing: border-box;
}
body {
font-family:
-apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu,
Cantarell, sans-serif;
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
min-height: 100vh;
display: flex;
justify-content: center;
align-items: center;
padding: 20px;
}
.container {
background: white;
border-radius: 12px;
box-shadow: 0 10px 40px rgba(0, 0, 0, 0.2);
padding: 40px;
max-width: 500px;
width: 100%;
}
h1 {
color: #333;
margin-bottom: 10px;
font-size: 28px;
}
.subtitle {
color: #666;
margin-bottom: 30px;
font-size: 14px;
}
.form-group {
margin-bottom: 20px;
}
label {
display: block;
margin-bottom: 8px;
color: #333;
font-weight: 600;
font-size: 14px;
}
input,
select {
width: 100%;
padding: 12px;
border: 1px solid #ddd;
border-radius: 6px;
font-size: 14px;
transition: border-color 0.2s;
}
input:focus,
select:focus {
outline: none;
border-color: #667eea;
}
.button {
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
color: white;
border: none;
padding: 12px 24px;
border-radius: 6px;
font-size: 16px;
font-weight: 600;
cursor: pointer;
transition:
transform 0.2s,
box-shadow 0.2s;
width: 100%;
margin-top: 10px;
}
.button:hover {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(102, 126, 234, 0.4);
}
.button:active {
transform: translateY(0);
}
.button:disabled {
opacity: 0.6;
cursor: not-allowed;
transform: none;
}
.button.secondary {
background: #6c757d;
margin-top: 10px;
}
.button.secondary:hover {
box-shadow: 0 4px 12px rgba(108, 117, 125, 0.4);
}
.message {
padding: 12px;
border-radius: 6px;
margin-bottom: 20px;
display: none;
}
.message.show {
display: block;
}
.message.error {
background: #ffebee;
border-left: 4px solid #f44336;
color: #c62828;
}
.message.success {
background: #e8f5e9;
border-left: 4px solid #4caf50;
color: #2e7d32;
}
.help-text {
font-size: 12px;
color: #666;
margin-top: 4px;
}
.loading {
text-align: center;
padding: 20px;
color: #666;
}
</style>
</head>
<body>
<div class="container">
<h1>🍼 Log Feeding</h1>
<p class="subtitle">Record a feeding session</p>
<div id="message" class="message"></div>
<div id="loadingChildren" class="loading">Loading children...</div>
<form id="logFeedingForm" style="display: none">
<div class="form-group">
<label for="childId">Child *</label>
<select id="childId" name="childId" required>
<option value="">Select a child</option>
</select>
</div>
<div class="form-group">
<label for="startTime">Start Time *</label>
<input
type="datetime-local"
id="startTime"
name="startTime"
required
/>
<p class="help-text">Defaults to current time</p>
</div>
<div class="form-group">
<label for="endTime">End Time</label>
<input type="datetime-local" id="endTime" name="endTime" />
<p class="help-text">Leave empty if feeding is ongoing</p>
</div>
<div class="form-group">
<label for="feedingType">Feeding Type *</label>
<select id="feedingType" name="feedingType" required>
<option value="">Select type</option>
<option value="left_breast">Left Breast</option>
<option value="right_breast">Right Breast</option>
<option value="bottle">Bottle</option>
</select>
</div>
<button type="submit" class="button" id="submitBtn">Log Feeding</button>
<button type="button" class="button secondary" onclick="goBack()">
Cancel
</button>
</form>
</div>
<script>
// Check if user is authenticated
const token = localStorage.getItem("access_token");
if (!token) {
window.location.href = "/login.html";
}
// Determine return URL based on referrer
function getReturnUrl() {
const referrer = document.referrer;
if (referrer.includes("/feedings.html")) {
return "/feedings.html";
}
// Default to home page
return "/";
}
const form = document.getElementById("logFeedingForm");
const messageDiv = document.getElementById("message");
const submitBtn = document.getElementById("submitBtn");
const loadingDiv = document.getElementById("loadingChildren");
const childSelect = document.getElementById("childId");
// Check if we're editing an existing feeding
const urlParams = new URLSearchParams(window.location.search);
const feedingId = urlParams.get("id");
const isEditMode = !!feedingId;
// Set default start time to now (only for new feedings)
if (!isEditMode) {
const now = new Date();
const localDateTime = new Date(
now.getTime() - now.getTimezoneOffset() * 60000,
)
.toISOString()
.slice(0, 16);
document.getElementById("startTime").value = localDateTime;
}
// Update title and button text if editing
if (isEditMode) {
document.querySelector("h1").textContent = "🍼 Edit Feeding";
document.querySelector(".subtitle").textContent =
"Update feeding session details";
submitBtn.textContent = "Update Feeding";
}
// Load user's children
async function loadChildren() {
try {
const response = await fetch("/api/children", {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (response.ok) {
const children = await response.json();
if (children.length === 0) {
showMessage(
"No children found. Please add a child first.",
"error",
);
setTimeout(() => {
window.location.href = "/add-child.html";
}, 2000);
return;
}
// Populate select dropdown or show single child
if (children.length === 1) {
// Single child: replace dropdown with text display
const child = children[0];
const formGroup = childSelect.parentElement;
formGroup.innerHTML = `
<label for="childName">Child</label>
<input
type="text"
id="childName"
value="${child.name}"
readonly
style="background-color: #f5f5f5; cursor: default;"
/>
<input type="hidden" id="childId" name="childId" value="${child.id}" />
`;
} else {
// Multiple children: show dropdown (clear placeholder first)
childSelect.innerHTML = "";
children.forEach((child) => {
const option = document.createElement("option");
option.value = child.id;
option.textContent = child.name;
childSelect.appendChild(option);
});
}
// Show form, hide loading
loadingDiv.style.display = "none";
form.style.display = "block";
// If editing, load the feeding data
if (isEditMode) {
loadFeedingData();
}
} else {
showMessage("Failed to load children", "error");
}
} catch (error) {
showMessage("Network error loading children", "error");
}
}
async function loadFeedingData() {
try {
const response = await fetch(`/api/feedings/${feedingId}`, {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (response.ok) {
const feeding = await response.json();
// Populate form with existing data
document.getElementById("childId").value = feeding.child_id;
// Format datetime for datetime-local input
const startTime = new Date(feeding.start_time);
const startLocalDateTime = new Date(
startTime.getTime() - startTime.getTimezoneOffset() * 60000,
)
.toISOString()
.slice(0, 16);
document.getElementById("startTime").value = startLocalDateTime;
if (feeding.end_time) {
const endTime = new Date(feeding.end_time);
const endLocalDateTime = new Date(
endTime.getTime() - endTime.getTimezoneOffset() * 60000,
)
.toISOString()
.slice(0, 16);
document.getElementById("endTime").value = endLocalDateTime;
}
document.getElementById("feedingType").value = feeding.feeding_type;
} else {
showMessage("Failed to load feeding data", "error");
}
} catch (error) {
showMessage("Network error loading feeding", "error");
}
}
loadChildren();
form.addEventListener("submit", async (e) => {
e.preventDefault();
const childId = parseInt(document.getElementById("childId").value);
const startTime = document.getElementById("startTime").value;
const endTimeValue = document.getElementById("endTime").value;
const feedingType = document.getElementById("feedingType").value;
// Disable button during request
submitBtn.disabled = true;
submitBtn.textContent = isEditMode ? "Updating..." : "Logging...";
messageDiv.classList.remove("show");
try {
const url = isEditMode
? `/api/feedings/${feedingId}`
: "/api/feedings";
const method = isEditMode ? "PUT" : "POST";
const response = await fetch(url, {
method: method,
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${token}`,
},
body: JSON.stringify({
child_id: childId,
start_time: startTime,
end_time: endTimeValue || null,
feeding_type: feedingType,
}),
});
const data = await response.json();
if (response.ok) {
showMessage(
isEditMode
? "Feeding updated successfully!"
: "Feeding logged successfully!",
"success",
);
// Redirect to appropriate page after 1 second
setTimeout(() => {
window.location.href = getReturnUrl();
}, 1000);
} else {
showMessage(
data.detail ||
`Failed to ${isEditMode ? "update" : "log"} feeding. Please try again.`,
"error",
);
}
} catch (error) {
showMessage("Network error. Please try again.", "error");
} finally {
submitBtn.disabled = false;
submitBtn.textContent = isEditMode ? "Update Feeding" : "Log Feeding";
}
});
function showMessage(text, type) {
messageDiv.textContent = text;
messageDiv.className = `message ${type} show`;
}
function goBack() {
window.location.href = getReturnUrl();
}
</script>
</body>
</html>
+414
View File
@@ -0,0 +1,414 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Log Sleep - 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, #4facfe 0%, #00f2fe 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: #4facfe;
}
.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;
width: 100%;
margin-top: 10px;
}
.button:hover {
transform: translateY(-2px);
box-shadow: 0 4px 12px rgba(79, 172, 254, 0.4);
}
.button:active {
transform: translateY(0);
}
.button:disabled {
opacity: 0.6;
cursor: not-allowed;
transform: none;
}
.button.secondary {
background: #6c757d;
margin-top: 10px;
}
.button.secondary:hover {
box-shadow: 0 4px 12px rgba(108, 117, 125, 0.4);
}
.message {
padding: 12px;
border-radius: 6px;
margin-bottom: 20px;
display: none;
}
.message.show {
display: block;
}
.message.error {
background: #ffebee;
border-left: 4px solid #f44336;
color: #c62828;
}
.message.success {
background: #e8f5e9;
border-left: 4px solid #4caf50;
color: #2e7d32;
}
.help-text {
font-size: 12px;
color: #666;
margin-top: 4px;
}
.loading {
text-align: center;
padding: 20px;
color: #666;
}
</style>
</head>
<body>
<div class="container">
<h1>😴 Log Sleep</h1>
<p class="subtitle">Record a sleep session</p>
<div id="message" class="message"></div>
<div id="loadingChildren" class="loading">Loading children...</div>
<form id="logSleepForm" style="display: none">
<div class="form-group">
<label for="childId">Child *</label>
<select id="childId" name="childId" required>
<option value="">Select a child</option>
</select>
</div>
<div class="form-group">
<label for="startTime">Start Time *</label>
<input
type="datetime-local"
id="startTime"
name="startTime"
required
/>
<p class="help-text">Defaults to current time</p>
</div>
<div class="form-group">
<label for="endTime">End Time</label>
<input type="datetime-local" id="endTime" name="endTime" />
<p class="help-text">Leave empty if sleep is ongoing</p>
</div>
<button type="submit" class="button" id="submitBtn">Log Sleep</button>
<button type="button" class="button secondary" onclick="goBack()">
Cancel
</button>
</form>
</div>
<script>
// Check if user is authenticated
const token = localStorage.getItem("access_token");
if (!token) {
window.location.href = "/login.html";
}
// Determine return URL based on referrer
function getReturnUrl() {
const referrer = document.referrer;
if (referrer.includes("/sleep.html")) {
return "/sleep.html";
}
// Default to home page
return "/";
}
const form = document.getElementById("logSleepForm");
const messageDiv = document.getElementById("message");
const submitBtn = document.getElementById("submitBtn");
const loadingDiv = document.getElementById("loadingChildren");
const childSelect = document.getElementById("childId");
// Check if we're editing an existing sleep session
const urlParams = new URLSearchParams(window.location.search);
const sleepId = urlParams.get("id");
const isEditMode = !!sleepId;
// Set default start time to now (only for new sleep sessions)
if (!isEditMode) {
const now = new Date();
const localDateTime = new Date(
now.getTime() - now.getTimezoneOffset() * 60000,
)
.toISOString()
.slice(0, 16);
document.getElementById("startTime").value = localDateTime;
}
// Update title and button text if editing
if (isEditMode) {
document.querySelector("h1").textContent = "😴 Edit Sleep";
document.querySelector(".subtitle").textContent =
"Update sleep session details";
submitBtn.textContent = "Update Sleep";
}
// Load user's children
async function loadChildren() {
try {
const response = await fetch("/api/children", {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (response.ok) {
const children = await response.json();
if (children.length === 0) {
showMessage(
"No children found. Please add a child first.",
"error",
);
setTimeout(() => {
window.location.href = "/add-child.html";
}, 2000);
return;
}
// Populate select dropdown or show single child
if (children.length === 1) {
// Single child: replace dropdown with text display
const child = children[0];
const formGroup = childSelect.parentElement;
formGroup.innerHTML = `
<label for="childName">Child</label>
<input
type="text"
id="childName"
value="${child.name}"
readonly
style="background-color: #f5f5f5; cursor: default;"
/>
<input type="hidden" id="childId" name="childId" value="${child.id}" />
`;
} else {
// Multiple children: show dropdown (clear placeholder first)
childSelect.innerHTML = "";
children.forEach((child) => {
const option = document.createElement("option");
option.value = child.id;
option.textContent = child.name;
childSelect.appendChild(option);
});
}
// Show form, hide loading
loadingDiv.style.display = "none";
form.style.display = "block";
// If editing, load the sleep data
if (isEditMode) {
loadSleepData();
}
} else {
showMessage("Failed to load children", "error");
}
} catch (error) {
showMessage("Network error loading children", "error");
}
}
async function loadSleepData() {
try {
const response = await fetch(`/api/sleep/${sleepId}`, {
headers: {
Authorization: `Bearer ${token}`,
},
});
if (response.ok) {
const sleep = await response.json();
// Populate form with existing data
document.getElementById("childId").value = sleep.child_id;
// Format datetime for datetime-local input
const startTime = new Date(sleep.start_time);
const startLocalDateTime = new Date(
startTime.getTime() - startTime.getTimezoneOffset() * 60000,
)
.toISOString()
.slice(0, 16);
document.getElementById("startTime").value = startLocalDateTime;
if (sleep.end_time) {
const endTime = new Date(sleep.end_time);
const endLocalDateTime = new Date(
endTime.getTime() - endTime.getTimezoneOffset() * 60000,
)
.toISOString()
.slice(0, 16);
document.getElementById("endTime").value = endLocalDateTime;
}
} else {
showMessage("Failed to load sleep data", "error");
}
} catch (error) {
showMessage("Network error loading sleep", "error");
}
}
loadChildren();
form.addEventListener("submit", async (e) => {
e.preventDefault();
const childId = parseInt(document.getElementById("childId").value);
const startTime = document.getElementById("startTime").value;
const endTimeValue = document.getElementById("endTime").value;
// Disable button during request
submitBtn.disabled = true;
submitBtn.textContent = isEditMode ? "Updating..." : "Logging...";
messageDiv.classList.remove("show");
try {
const url = isEditMode ? `/api/sleep/${sleepId}` : "/api/sleep";
const method = isEditMode ? "PUT" : "POST";
const response = await fetch(url, {
method: method,
headers: {
"Content-Type": "application/json",
Authorization: `Bearer ${token}`,
},
body: JSON.stringify({
child_id: childId,
start_time: startTime,
end_time: endTimeValue || null,
}),
});
const data = await response.json();
if (response.ok) {
showMessage(
isEditMode
? "Sleep updated successfully!"
: "Sleep logged successfully!",
"success",
);
// Redirect to appropriate page after 1 second
setTimeout(() => {
window.location.href = getReturnUrl();
}, 1000);
} else {
showMessage(
data.detail ||
`Failed to ${isEditMode ? "update" : "log"} sleep. Please try again.`,
"error",
);
}
} catch (error) {
showMessage("Network error. Please try again.", "error");
} finally {
submitBtn.disabled = false;
submitBtn.textContent = isEditMode ? "Update Sleep" : "Log Sleep";
}
});
function showMessage(text, type) {
messageDiv.textContent = text;
messageDiv.className = `message ${type} show`;
}
function goBack() {
window.location.href = getReturnUrl();
}
</script>
</body>
</html>
+8 -3
View File
@@ -3,7 +3,7 @@
<head> <head>
<meta charset="UTF-8" /> <meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Baby Monitor - Login</title> <title>Baby Monitor</title>
<style> <style>
body { body {
font-family: Arial, sans-serif; font-family: Arial, sans-serif;
@@ -112,9 +112,14 @@
// Store token in localStorage // Store token in localStorage
localStorage.setItem("access_token", data.access_token); localStorage.setItem("access_token", data.access_token);
localStorage.setItem("username", data.username); localStorage.setItem("username", data.username);
// Redirect to home page
// Redirect based on is_admin from login response
setTimeout(() => { setTimeout(() => {
window.location.href = "/"; if (data.is_admin === true) {
window.location.href = "/admin.html";
} else {
window.location.href = "/";
}
}, 1000); }, 1000);
} else { } else {
showMessage(data.detail || "Login failed", "error"); showMessage(data.detail || "Login failed", "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";
}
}
+383
View File
@@ -0,0 +1,383 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="UTF-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Baby Monitor - Register</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: 450px;
width: 100%;
}
h1 {
color: #333;
margin-bottom: 10px;
font-size: 28px;
text-align: center;
}
.subtitle {
color: #666;
margin-bottom: 30px;
font-size: 14px;
text-align: center;
}
.form-group {
margin-bottom: 20px;
}
label {
display: block;
margin-bottom: 8px;
color: #444;
font-weight: 600;
font-size: 14px;
}
input {
width: 100%;
padding: 12px;
border: 2px solid #e0e0e0;
border-radius: 6px;
font-size: 16px;
transition: border-color 0.3s;
}
input:focus {
outline: none;
border-color: #667eea;
}
.button {
width: 100%;
background: linear-gradient(135deg, #667eea 0%, #764ba2 100%);
color: white;
border: none;
padding: 14px;
border-radius: 6px;
font-size: 16px;
font-weight: 600;
cursor: pointer;
transition:
transform 0.2s,
box-shadow 0.2s;
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;
}
.error {
background: #ffebee;
border-left: 4px solid #f44336;
color: #c62828;
padding: 12px;
border-radius: 4px;
margin-bottom: 20px;
display: none;
font-size: 14px;
}
.error.show {
display: block;
}
.success {
background: #e8f5e9;
border-left: 4px solid #4caf50;
color: #2e7d32;
padding: 12px;
border-radius: 4px;
margin-bottom: 20px;
display: none;
font-size: 14px;
}
.success.show {
display: block;
}
.loading-container {
text-align: center;
padding: 40px;
}
.spinner {
border: 3px solid #f3f3f3;
border-top: 3px solid #667eea;
border-radius: 50%;
width: 40px;
height: 40px;
animation: spin 1s linear infinite;
margin: 0 auto 20px;
}
@keyframes spin {
0% {
transform: rotate(0deg);
}
100% {
transform: rotate(360deg);
}
}
.info-box {
background: #e7f3ff;
border-left: 4px solid #2196f3;
padding: 12px;
border-radius: 4px;
margin-bottom: 20px;
font-size: 14px;
color: #555;
}
.hidden {
display: none;
}
.password-requirements {
font-size: 12px;
color: #666;
margin-top: 5px;
}
.password-requirements ul {
margin: 5px 0 0 20px;
}
</style>
</head>
<body>
<div class="container">
<div id="loadingContainer" class="loading-container">
<div class="spinner"></div>
<p style="color: #666">Validating invitation...</p>
</div>
<div id="registerContainer" class="hidden">
<h1>🎉 Create Your Account</h1>
<p class="subtitle">Complete the registration to get started</p>
<div id="error" class="error"></div>
<div id="success" class="success"></div>
<form id="registerForm" onsubmit="handleRegister(event)">
<div class="form-group">
<label for="username">Username</label>
<input
type="text"
id="username"
name="username"
required
minlength="3"
autocomplete="username"
placeholder="Choose a username"
/>
</div>
<div class="form-group">
<label for="password">Password</label>
<input
type="password"
id="password"
name="password"
required
minlength="8"
autocomplete="new-password"
placeholder="Choose a strong password"
/>
<div class="password-requirements">
<ul>
<li>At least 8 characters long</li>
<li>Mix of letters, numbers recommended</li>
</ul>
</div>
</div>
<div class="form-group">
<label for="confirmPassword">Confirm Password</label>
<input
type="password"
id="confirmPassword"
name="confirmPassword"
required
minlength="8"
autocomplete="new-password"
placeholder="Re-enter your password"
/>
</div>
<button type="submit" class="button" id="submitBtn">
Create Account
</button>
</form>
</div>
<div id="invalidTokenContainer" class="hidden">
<h1>⚠️ Invalid Invitation</h1>
<p class="subtitle">This invitation link is invalid or has expired</p>
<div class="info-box">
This could mean:
<ul style="margin: 10px 0 0 20px; color: #555">
<li>The invitation has already been used</li>
<li>The invitation has expired (24 hours)</li>
<li>The invitation link is incorrect</li>
</ul>
</div>
<p style="text-align: center; color: #666; margin-top: 20px">
Please contact an administrator for a new invitation link.
</p>
</div>
</div>
<script>
let invitationToken = null;
// Extract token from URL query parameters
const urlParams = new URLSearchParams(window.location.search);
invitationToken = urlParams.get("token");
// Validate token on page load
window.addEventListener("DOMContentLoaded", async () => {
if (!invitationToken) {
showInvalidToken();
return;
}
try {
// Verify the invitation token
const response = await fetch(
`/api/verify-invitation?token=${encodeURIComponent(invitationToken)}`,
);
if (response.ok) {
showRegisterForm();
} else {
showInvalidToken();
}
} catch (error) {
console.error("Error validating invitation:", error);
showInvalidToken();
}
});
function showRegisterForm() {
document.getElementById("loadingContainer").classList.add("hidden");
document.getElementById("registerContainer").classList.remove("hidden");
}
function showInvalidToken() {
document.getElementById("loadingContainer").classList.add("hidden");
document
.getElementById("invalidTokenContainer")
.classList.remove("hidden");
}
async function handleRegister(event) {
event.preventDefault();
const username = document.getElementById("username").value;
const password = document.getElementById("password").value;
const confirmPassword =
document.getElementById("confirmPassword").value;
const errorDiv = document.getElementById("error");
const successDiv = document.getElementById("success");
const submitBtn = document.getElementById("submitBtn");
// Clear previous messages
errorDiv.classList.remove("show");
successDiv.classList.remove("show");
// Validate passwords match
if (password !== confirmPassword) {
errorDiv.textContent = "Passwords do not match!";
errorDiv.classList.add("show");
return;
}
// Disable submit button
submitBtn.disabled = true;
submitBtn.textContent = "Creating Account...";
try {
const response = await fetch("/api/register", {
method: "POST",
headers: {
"Content-Type": "application/json",
},
body: JSON.stringify({
username: username,
password: password,
invitation_token: invitationToken,
}),
});
const data = await response.json();
if (response.ok) {
// Store the access token and username
localStorage.setItem("access_token", data.access_token);
localStorage.setItem("username", data.username);
// Show success message
successDiv.textContent =
"Account created successfully! Redirecting...";
successDiv.classList.add("show");
// Redirect to home page after a brief delay
setTimeout(() => {
window.location.href = "/";
}, 1500);
} else {
errorDiv.textContent =
data.detail || "Registration failed. Please try again.";
errorDiv.classList.add("show");
submitBtn.disabled = false;
submitBtn.textContent = "Create Account";
}
} catch (error) {
console.error("Registration error:", error);
errorDiv.textContent = "An error occurred. Please try again.";
errorDiv.classList.add("show");
submitBtn.disabled = false;
submitBtn.textContent = "Create Account";
}
}
</script>
</body>
</html>
+859
View File
@@ -0,0 +1,859 @@
<!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-color: #f0f0f0;
min-height: 100vh;
max-width: 800px;
margin: 2rem auto;
padding: 0 1rem;
}
.container {
background: white;
border-radius: 12px;
box-shadow: 0 10px 40px rgba(0, 0, 0, 0.2);
padding: 40px;
}
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) => {
// Get list of other users (excluding current user)
const otherUsers =
child.parent_usernames && child.parent_usernames.length > 1
? child.parent_usernames.filter(
(username) => username !== currentUser.username,
)
: [];
return `
<div class="child-card">
<h3 style="margin: 0;">👶 ${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>
${otherUsers.length > 0 ? `<p><strong>Shared with:</strong> ${otherUsers.join(", ")}</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) {
const child = children.find((c) => c.id === childId);
if (!child) return;
// Redirect to add-child page with child data in query params
const params = new URLSearchParams({
id: child.id,
name: child.name,
birth_time: child.birth_time,
birth_weight: child.birth_weight,
});
window.location.href = `/add-child.html?${params.toString()}`;
}
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>
File diff suppressed because it is too large Load Diff
+11
View File
@@ -0,0 +1,11 @@
"""Utility functions for the baby monitor application."""
from .hash_password import hash_password
from .verify_child_access import verify_child_access
from .verify_password import verify_password
__all__ = [
"verify_child_access",
"hash_password",
"verify_password",
]
+17
View File
@@ -0,0 +1,17 @@
"""Definition of hash_password function."""
import bcrypt
def hash_password(password: str) -> str:
"""Hash a password using bcrypt.
Args:
password: Plain text password to hash
Returns:
Hashed password as a string
"""
salt = bcrypt.gensalt()
hashed: bytes = bcrypt.hashpw(password.encode("utf-8"), salt)
return hashed.decode("utf-8")
@@ -0,0 +1,28 @@
"""Definition of verify_child_access function."""
from fastapi import HTTPException
from baby_monitor.repositories.interfaces import (
ChildRepositoryInterface,
)
def verify_child_access(
child_repo: ChildRepositoryInterface, 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")
+19
View File
@@ -0,0 +1,19 @@
"""Definition of verify_password function."""
import bcrypt
def verify_password(password: str, hashed_password: str) -> bool:
"""Verify a password against a hashed password.
Args:
password: Plain text password to verify
hashed_password: Previously hashed password
Returns:
True if password matches, False otherwise
"""
result: bool = bcrypt.checkpw(
password.encode("utf-8"), hashed_password.encode("utf-8")
)
return result
+6
View File
@@ -12,3 +12,9 @@ def pytest_configure(config: pytest.Config) -> None:
tmpdir = tempfile.mkdtemp(prefix="baby_monitor_test_") tmpdir = tempfile.mkdtemp(prefix="baby_monitor_test_")
os.environ["DATA_DIR"] = tmpdir os.environ["DATA_DIR"] = tmpdir
os.environ["ENVIRONMENT"] = "development" os.environ["ENVIRONMENT"] = "development"
# Set admin credentials for tests
if "ADMIN_USERNAME" not in os.environ:
os.environ["ADMIN_USERNAME"] = "admin"
if "ADMIN_PASSWORD" not in os.environ:
os.environ["ADMIN_PASSWORD"] = "password"
Generated
+79
View File
@@ -39,6 +39,7 @@ name = "baby-monitor"
version = "0.1.0" version = "0.1.0"
source = { editable = "." } source = { editable = "." }
dependencies = [ dependencies = [
{ name = "bcrypt" },
{ name = "fastapi" }, { name = "fastapi" },
{ name = "sqlalchemy" }, { name = "sqlalchemy" },
{ name = "uvicorn" }, { name = "uvicorn" },
@@ -57,6 +58,7 @@ dev = [
{ name = "httpx" }, { name = "httpx" },
{ name = "mypy" }, { name = "mypy" },
{ name = "pre-commit" }, { name = "pre-commit" },
{ name = "prettier" },
{ name = "pytest" }, { name = "pytest" },
{ name = "pytest-cov" }, { name = "pytest-cov" },
{ name = "pyupgrade" }, { name = "pyupgrade" },
@@ -66,6 +68,7 @@ dev = [
[package.metadata] [package.metadata]
requires-dist = [ requires-dist = [
{ name = "bcrypt", specifier = ">=4.0.0" },
{ name = "fastapi", specifier = ">=0.121.0" }, { name = "fastapi", specifier = ">=0.121.0" },
{ name = "psycopg2-binary", marker = "extra == 'postgres'", specifier = ">=2.9.0" }, { name = "psycopg2-binary", marker = "extra == 'postgres'", specifier = ">=2.9.0" },
{ name = "redis", marker = "extra == 'redis'", specifier = ">=5.0.0" }, { name = "redis", marker = "extra == 'redis'", specifier = ">=5.0.0" },
@@ -79,6 +82,7 @@ dev = [
{ name = "httpx", specifier = ">=0.28.1" }, { name = "httpx", specifier = ">=0.28.1" },
{ name = "mypy", specifier = ">=1.18.2" }, { name = "mypy", specifier = ">=1.18.2" },
{ name = "pre-commit", specifier = ">=4.3.0" }, { name = "pre-commit", specifier = ">=4.3.0" },
{ name = "prettier", specifier = ">=0.0.7" },
{ name = "pytest", specifier = ">=8.4.2" }, { name = "pytest", specifier = ">=8.4.2" },
{ name = "pytest-cov", specifier = ">=7.0.0" }, { name = "pytest-cov", specifier = ">=7.0.0" },
{ name = "pyupgrade", specifier = ">=3.21.0" }, { name = "pyupgrade", specifier = ">=3.21.0" },
@@ -86,6 +90,72 @@ dev = [
{ name = "types-psycopg2", specifier = ">=2.9.21.20251012" }, { name = "types-psycopg2", specifier = ">=2.9.21.20251012" },
] ]
[[package]]
name = "bcrypt"
version = "5.0.0"
source = { registry = "http://10.0.0.2:5001/index/" }
sdist = { url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0.tar.gz", hash = "sha256:f748f7c2d6fd375cc93d3fba7ef4a9e3a092421b8dbf34d8d4dc06be9492dfdd" }
wheels = [
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp313-cp313t-macosx_10_12_universal2.whl", hash = "sha256:f3c08197f3039bec79cee59a606d62b96b16669cff3949f21e74796b6e3cd2be" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp313-cp313t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:200af71bc25f22006f4069060c88ed36f8aa4ff7f53e67ff04d2ab3f1e79a5b2" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp313-cp313t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:baade0a5657654c2984468efb7d6c110db87ea63ef5a4b54732e7e337253e44f" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp313-cp313t-manylinux_2_28_aarch64.whl", hash = "sha256:c58b56cdfb03202b3bcc9fd8daee8e8e9b6d7e3163aa97c631dfcfcc24d36c86" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp313-cp313t-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:4bfd2a34de661f34d0bda43c3e4e79df586e4716ef401fe31ea39d69d581ef23" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp313-cp313t-manylinux_2_28_x86_64.whl", hash = "sha256:ed2e1365e31fc73f1825fa830f1c8f8917ca1b3ca6185773b349c20fd606cec2" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp313-cp313t-manylinux_2_34_aarch64.whl", hash = "sha256:83e787d7a84dbbfba6f250dd7a5efd689e935f03dd83b0f919d39349e1f23f83" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp313-cp313t-manylinux_2_34_x86_64.whl", hash = "sha256:137c5156524328a24b9fac1cb5db0ba618bc97d11970b39184c1d87dc4bf1746" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp313-cp313t-musllinux_1_1_aarch64.whl", hash = "sha256:38cac74101777a6a7d3b3e3cfefa57089b5ada650dce2baf0cbdd9d65db22a9e" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp313-cp313t-musllinux_1_1_x86_64.whl", hash = "sha256:d8d65b564ec849643d9f7ea05c6d9f0cd7ca23bdd4ac0c2dbef1104ab504543d" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp313-cp313t-musllinux_1_2_aarch64.whl", hash = "sha256:741449132f64b3524e95cd30e5cd3343006ce146088f074f31ab26b94e6c75ba" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp313-cp313t-musllinux_1_2_x86_64.whl", hash = "sha256:212139484ab3207b1f0c00633d3be92fef3c5f0af17cad155679d03ff2ee1e41" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp313-cp313t-win32.whl", hash = "sha256:9d52ed507c2488eddd6a95bccee4e808d3234fa78dd370e24bac65a21212b861" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp313-cp313t-win_amd64.whl", hash = "sha256:f6984a24db30548fd39a44360532898c33528b74aedf81c26cf29c51ee47057e" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp313-cp313t-win_arm64.whl", hash = "sha256:9fffdb387abe6aa775af36ef16f55e318dcda4194ddbf82007a6f21da29de8f5" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp314-cp314t-macosx_10_12_universal2.whl", hash = "sha256:4870a52610537037adb382444fefd3706d96d663ac44cbb2f37e3919dca3d7ef" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp314-cp314t-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:48f753100931605686f74e27a7b49238122aa761a9aefe9373265b8b7aa43ea4" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp314-cp314t-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:f70aadb7a809305226daedf75d90379c397b094755a710d7014b8b117df1ebbf" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp314-cp314t-manylinux_2_28_aarch64.whl", hash = "sha256:744d3c6b164caa658adcb72cb8cc9ad9b4b75c7db507ab4bc2480474a51989da" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp314-cp314t-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:a28bc05039bdf3289d757f49d616ab3efe8cf40d8e8001ccdd621cd4f98f4fc9" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp314-cp314t-manylinux_2_28_x86_64.whl", hash = "sha256:7f277a4b3390ab4bebe597800a90da0edae882c6196d3038a73adf446c4f969f" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp314-cp314t-manylinux_2_34_aarch64.whl", hash = "sha256:79cfa161eda8d2ddf29acad370356b47f02387153b11d46042e93a0a95127493" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp314-cp314t-manylinux_2_34_x86_64.whl", hash = "sha256:a5393eae5722bcef046a990b84dff02b954904c36a194f6cfc817d7dca6c6f0b" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp314-cp314t-musllinux_1_2_aarch64.whl", hash = "sha256:7f4c94dec1b5ab5d522750cb059bb9409ea8872d4494fd152b53cca99f1ddd8c" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp314-cp314t-musllinux_1_2_x86_64.whl", hash = "sha256:0cae4cb350934dfd74c020525eeae0a5f79257e8a201c0c176f4b84fdbf2a4b4" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp314-cp314t-win32.whl", hash = "sha256:b17366316c654e1ad0306a6858e189fc835eca39f7eb2cafd6aaca8ce0c40a2e" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp314-cp314t-win_amd64.whl", hash = "sha256:92864f54fb48b4c718fc92a32825d0e42265a627f956bc0361fe869f1adc3e7d" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp314-cp314t-win_arm64.whl", hash = "sha256:dd19cf5184a90c873009244586396a6a884d591a5323f0e8a5922560718d4993" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp38-abi3-macosx_10_12_universal2.whl", hash = "sha256:fc746432b951e92b58317af8e0ca746efe93e66555f1b40888865ef5bf56446b" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp38-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:c2388ca94ffee269b6038d48747f4ce8df0ffbea43f31abfa18ac72f0218effb" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp38-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:560ddb6ec730386e7b3b26b8b4c88197aaed924430e7b74666a586ac997249ef" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp38-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:d79e5c65dcc9af213594d6f7f1fa2c98ad3fc10431e7aa53c176b441943efbdd" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp38-abi3-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:2b732e7d388fa22d48920baa267ba5d97cca38070b69c0e2d37087b381c681fd" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp38-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:0c8e093ea2532601a6f686edbc2c6b2ec24131ff5c52f7610dd64fa4553b5464" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp38-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:5b1589f4839a0899c146e8892efe320c0fa096568abd9b95593efac50a87cb75" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp38-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:89042e61b5e808b67daf24a434d89bab164d4de1746b37a8d173b6b14f3db9ff" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp38-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:e3cf5b2560c7b5a142286f69bde914494b6d8f901aaa71e453078388a50881c4" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp38-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:f632fd56fc4e61564f78b46a2269153122db34988e78b6be8b32d28507b7eaeb" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp38-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:801cad5ccb6b87d1b430f183269b94c24f248dddbbc5c1f78b6ed231743e001c" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp38-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:3cf67a804fc66fc217e6914a5635000259fbbbb12e78a99488e4d5ba445a71eb" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp38-abi3-win32.whl", hash = "sha256:3abeb543874b2c0524ff40c57a4e14e5d3a66ff33fb423529c88f180fd756538" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp38-abi3-win_amd64.whl", hash = "sha256:35a77ec55b541e5e583eb3436ffbbf53b0ffa1fa16ca6782279daf95d146dcd9" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp38-abi3-win_arm64.whl", hash = "sha256:cde08734f12c6a4e28dc6755cd11d3bdfea608d93d958fffbe95a7026ebe4980" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp39-abi3-macosx_10_12_universal2.whl", hash = "sha256:0c418ca99fd47e9c59a301744d63328f17798b5947b0f791e9af3c1c499c2d0a" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp39-abi3-manylinux2014_aarch64.manylinux_2_17_aarch64.whl", hash = "sha256:ddb4e1500f6efdd402218ffe34d040a1196c072e07929b9820f363a1fd1f4191" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp39-abi3-manylinux2014_x86_64.manylinux_2_17_x86_64.whl", hash = "sha256:7aeef54b60ceddb6f30ee3db090351ecf0d40ec6e2abf41430997407a46d2254" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp39-abi3-manylinux_2_28_aarch64.whl", hash = "sha256:f0ce778135f60799d89c9693b9b398819d15f1921ba15fe719acb3178215a7db" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp39-abi3-manylinux_2_28_armv7l.manylinux_2_31_armv7l.whl", hash = "sha256:a71f70ee269671460b37a449f5ff26982a6f2ba493b3eabdd687b4bf35f875ac" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp39-abi3-manylinux_2_28_x86_64.whl", hash = "sha256:f8429e1c410b4073944f03bd778a9e066e7fad723564a52ff91841d278dfc822" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp39-abi3-manylinux_2_34_aarch64.whl", hash = "sha256:edfcdcedd0d0f05850c52ba3127b1fce70b9f89e0fe5ff16517df7e81fa3cbb8" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp39-abi3-manylinux_2_34_x86_64.whl", hash = "sha256:611f0a17aa4a25a69362dcc299fda5c8a3d4f160e2abb3831041feb77393a14a" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp39-abi3-musllinux_1_1_aarch64.whl", hash = "sha256:db99dca3b1fdc3db87d7c57eac0c82281242d1eabf19dcb8a6b10eb29a2e72d1" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp39-abi3-musllinux_1_1_x86_64.whl", hash = "sha256:5feebf85a9cefda32966d8171f5db7e3ba964b77fdfe31919622256f80f9cf42" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp39-abi3-musllinux_1_2_aarch64.whl", hash = "sha256:3ca8a166b1140436e058298a34d88032ab62f15aae1c598580333dc21d27ef10" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp39-abi3-musllinux_1_2_x86_64.whl", hash = "sha256:61afc381250c3182d9078551e3ac3a41da14154fbff647ddf52a769f588c4172" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp39-abi3-win32.whl", hash = "sha256:64d7ce196203e468c457c37ec22390f1a61c85c6f0b8160fd752940ccfb3a683" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp39-abi3-win_amd64.whl", hash = "sha256:64ee8434b0da054d830fa8e89e1c8bf30061d539044a39524ff7dec90481e5c2" },
{ url = "http://10.0.0.2:5001/index/bcrypt/bcrypt-5.0.0-cp39-abi3-win_arm64.whl", hash = "sha256:f2347d3534e76bf50bca5500989d6c1d05ed64b440408057a37673282c654927" },
]
[[package]] [[package]]
name = "certifi" name = "certifi"
version = "2025.10.5" version = "2025.10.5"
@@ -437,6 +507,15 @@ wheels = [
{ url = "http://10.0.0.2:5001/index/pre-commit/pre_commit-4.3.0-py2.py3-none-any.whl", hash = "sha256:2b0747ad7e6e967169136edffee14c16e148a778a54e4f967921aa1ebf2308d8" }, { url = "http://10.0.0.2:5001/index/pre-commit/pre_commit-4.3.0-py2.py3-none-any.whl", hash = "sha256:2b0747ad7e6e967169136edffee14c16e148a778a54e4f967921aa1ebf2308d8" },
] ]
[[package]]
name = "prettier"
version = "0.0.7"
source = { registry = "http://10.0.0.2:5001/index/" }
sdist = { url = "http://10.0.0.2:5001/index/prettier/prettier-0.0.7.tar.gz", hash = "sha256:6c34b8cd09fd9c8956c05d6395ea3f575e0122dce494ba57685c07065abed427" }
wheels = [
{ url = "http://10.0.0.2:5001/index/prettier/prettier-0.0.7-py3-none-any.whl", hash = "sha256:20e76791de41cafe481328dd49552303f29ca192151cee1b120c26f66cae9bfc" },
]
[[package]] [[package]]
name = "psycopg2-binary" name = "psycopg2-binary"
version = "2.9.11" version = "2.9.11"