mirror of
https://github.com/escalante29/healthy-fit.git
synced 2026-03-21 13:48:46 +01:00
Add supplements, kettlebell, calendar, push notifications, and PWA support
- Supplement tracking: CRUD endpoints, /today, /logs, Supplements page - Kettlebell workouts: session tracking, analytics endpoint, ActiveSession page - Calendar module: events CRUD, calendar components - Push notifications: VAPID keys, PushSubscription model, APScheduler reminders, service worker with push/notificationclick handlers, Profile notifications UI - PWA: vite-plugin-pwa, manifest, icons, service worker generation - Frontend: TypeScript types, API modules, ConfirmModal, toast notifications - Auth fixes: password hashing, nutrition endpoint auth - CLAUDE.md: project documentation and development guide Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
27
backend/app/models/calendar.py
Normal file
27
backend/app/models/calendar.py
Normal file
@@ -0,0 +1,27 @@
|
||||
import datetime as dt
|
||||
from typing import Optional
|
||||
|
||||
from sqlmodel import Field, SQLModel
|
||||
|
||||
|
||||
class DailyNote(SQLModel, table=True):
|
||||
id: Optional[int] = Field(default=None, primary_key=True)
|
||||
user_id: int = Field(foreign_key="user.id", index=True)
|
||||
date: dt.date = Field(index=True)
|
||||
content: str = Field(default="", max_length=10000)
|
||||
mood: Optional[str] = None # "great"/"good"/"okay"/"bad"/"awful"
|
||||
energy_level: Optional[int] = None # 1–10
|
||||
updated_at: dt.datetime = Field(default_factory=dt.datetime.utcnow)
|
||||
|
||||
|
||||
class CalendarEvent(SQLModel, table=True):
|
||||
id: Optional[int] = Field(default=None, primary_key=True)
|
||||
user_id: int = Field(foreign_key="user.id", index=True)
|
||||
date: dt.date = Field(index=True)
|
||||
title: str
|
||||
description: Optional[str] = None
|
||||
event_type: str = "general" # "workout" | "supplement" | "general"
|
||||
color: Optional[str] = None
|
||||
start_time: Optional[str] = None # "HH:MM"
|
||||
is_completed: bool = False
|
||||
created_at: dt.datetime = Field(default_factory=dt.datetime.utcnow)
|
||||
44
backend/app/models/kettlebell.py
Normal file
44
backend/app/models/kettlebell.py
Normal file
@@ -0,0 +1,44 @@
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
|
||||
from pydantic import BaseModel
|
||||
from sqlmodel import JSON, Field, SQLModel
|
||||
|
||||
|
||||
class ExerciseBlock(BaseModel):
|
||||
order: int
|
||||
name: str
|
||||
description: str
|
||||
sets: int
|
||||
reps: int
|
||||
duration_seconds: int # reps=0 → timed, duration_seconds=0 → rep-based
|
||||
weight_kg: float
|
||||
rest_seconds: int
|
||||
coaching_tip: str
|
||||
|
||||
|
||||
class KettlebellSession(SQLModel, table=True):
|
||||
id: Optional[int] = Field(default=None, primary_key=True)
|
||||
user_id: int = Field(foreign_key="user.id", index=True)
|
||||
title: str
|
||||
focus: str # e.g. "strength", "conditioning"
|
||||
exercises: dict = Field(default={}, sa_type=JSON) # full AI-prescribed exercise list
|
||||
total_duration_min: int
|
||||
difficulty: str
|
||||
notes: str = Field(default="")
|
||||
status: str = Field(default="generated") # "generated" | "in_progress" | "completed" | "abandoned"
|
||||
started_at: Optional[datetime] = Field(default=None)
|
||||
completed_at: Optional[datetime] = Field(default=None)
|
||||
created_at: datetime = Field(default_factory=datetime.utcnow)
|
||||
|
||||
|
||||
class KettlebellSetLog(SQLModel, table=True):
|
||||
id: Optional[int] = Field(default=None, primary_key=True)
|
||||
session_id: int = Field(foreign_key="kettlebellsession.id", index=True)
|
||||
exercise_order: int
|
||||
set_number: int
|
||||
actual_reps: int
|
||||
actual_weight_kg: float
|
||||
actual_duration_seconds: int
|
||||
perceived_effort: int # 1–10 RPE
|
||||
completed_at: datetime = Field(default_factory=datetime.utcnow)
|
||||
17
backend/app/models/push_subscription.py
Normal file
17
backend/app/models/push_subscription.py
Normal file
@@ -0,0 +1,17 @@
|
||||
from datetime import datetime
|
||||
from typing import Optional
|
||||
|
||||
from sqlmodel import Field, SQLModel
|
||||
|
||||
|
||||
class PushSubscription(SQLModel, table=True):
|
||||
id: Optional[int] = Field(default=None, primary_key=True)
|
||||
user_id: int = Field(foreign_key="user.id", index=True)
|
||||
endpoint: str = Field(unique=True, index=True)
|
||||
p256dh: str
|
||||
auth: str
|
||||
reminder_hour: int = Field(default=9)
|
||||
reminder_minute: int = Field(default=0)
|
||||
timezone: str = Field(default="UTC")
|
||||
is_active: bool = Field(default=True)
|
||||
created_at: datetime = Field(default_factory=datetime.utcnow)
|
||||
27
backend/app/models/supplement.py
Normal file
27
backend/app/models/supplement.py
Normal file
@@ -0,0 +1,27 @@
|
||||
from datetime import datetime
|
||||
from typing import List, Optional
|
||||
|
||||
from sqlalchemy import Column
|
||||
from sqlmodel import JSON, Field, SQLModel
|
||||
|
||||
|
||||
class Supplement(SQLModel, table=True):
|
||||
id: Optional[int] = Field(default=None, primary_key=True)
|
||||
user_id: int = Field(foreign_key="user.id", index=True)
|
||||
name: str = Field(index=True)
|
||||
dosage: float
|
||||
unit: str # mg / mcg / IU / g
|
||||
frequency: str = Field(default="daily") # daily / weekly / as_needed
|
||||
scheduled_times: List[str] = Field(default=[], sa_column=Column(JSON)) # ["08:00", "20:00"]
|
||||
notes: Optional[str] = None
|
||||
is_active: bool = Field(default=True)
|
||||
created_at: datetime = Field(default_factory=datetime.utcnow)
|
||||
|
||||
|
||||
class SupplementLog(SQLModel, table=True):
|
||||
id: Optional[int] = Field(default=None, primary_key=True)
|
||||
user_id: int = Field(foreign_key="user.id", index=True)
|
||||
supplement_id: int = Field(foreign_key="supplement.id", index=True)
|
||||
taken_at: datetime = Field(default_factory=datetime.utcnow)
|
||||
dose_taken: Optional[float] = None
|
||||
notes: Optional[str] = None
|
||||
@@ -19,4 +19,10 @@ class User(SQLModel, table=True):
|
||||
weight: Optional[float] = None
|
||||
unit_preference: str = Field(default="metric") # "metric" or "imperial"
|
||||
|
||||
# Nutrition Targets
|
||||
target_calories: Optional[float] = None
|
||||
target_protein: Optional[float] = None
|
||||
target_carbs: Optional[float] = None
|
||||
target_fat: Optional[float] = None
|
||||
|
||||
created_at: datetime = Field(default_factory=datetime.utcnow)
|
||||
|
||||
Reference in New Issue
Block a user