Self-hosted fitness tracker. Log workouts, track nutrition, and monitor progress. Docker deployment, mobile-friendly.
feat: programs, active workout sessions, and device-local session sync
Cawlummac510f336abd
diff --git a/backend/controllers/active_session.go b/backend/controllers/active_session.gonew file mode 100644index 0000000..5ad4fc1--- /dev/null+++ b/backend/controllers/active_session.go@@ -0,0 +1,57 @@+package controllers++import (+ "database/sql"+ "time"++ "github.com/Cawlumm/lyftr-backend/db"+ "github.com/Cawlumm/lyftr-backend/middleware"+ "github.com/Cawlumm/lyftr-backend/utils"+ "github.com/gin-gonic/gin"+)++func GetActiveSession(c *gin.Context) {+ uid := middleware.UserID(c)+ var data string+ var updatedAt time.Time+ err := db.DB.QueryRow(+ `SELECT data, updated_at FROM active_sessions WHERE user_id = ?`, uid,+ ).Scan(&data, &updatedAt)+ if err == sql.ErrNoRows {+ utils.OK(c, nil)+ return+ }+ if err != nil {+ utils.InternalError(c)+ return+ }+ c.JSON(200, gin.H{"data": gin.H{"data": data, "updated_at": updatedAt}})+}++func UpsertActiveSession(c *gin.Context) {+ uid := middleware.UserID(c)+ var body struct {+ Data string `json:"data" binding:"required"`+ }+ if err := c.ShouldBindJSON(&body); err != nil {+ utils.BadRequest(c, err.Error())+ return+ }+ _, err := db.DB.Exec(+ `INSERT INTO active_sessions (user_id, data, updated_at)+ VALUES (?, ?, CURRENT_TIMESTAMP)+ ON CONFLICT(user_id) DO UPDATE SET data = excluded.data, updated_at = CURRENT_TIMESTAMP`,+ uid, body.Data,+ )+ if err != nil {+ utils.InternalError(c)+ return+ }+ utils.OK(c, gin.H{"saved": true})+}++func DeleteActiveSession(c *gin.Context) {+ uid := middleware.UserID(c)+ db.DB.Exec(`DELETE FROM active_sessions WHERE user_id = ?`, uid)+ utils.OK(c, gin.H{"deleted": true})+}diff --git a/backend/controllers/exercises.go b/backend/controllers/exercises.goindex 5d8c60b..0feb905 100644--- a/backend/controllers/exercises.go+++ b/backend/controllers/exercises.go@@ -33,7 +33,12 @@ func ListExercises(c *gin.Context) {args = append(args, eq)}- query += " ORDER BY name LIMIT 100"+ limit := 100+ if l, err := strconv.Atoi(c.Query("limit")); err == nil && l > 0 && l <= 2000 {+ limit = l+ }+ query += " ORDER BY name LIMIT ?"+ args = append(args, limit)rows, err := db.DB.Query(query, args...)if err != nil {diff --git a/backend/controllers/programs.go b/backend/controllers/programs.gonew file mode 100644index 0000000..e3a5253--- /dev/null+++ b/backend/controllers/programs.go@@ -0,0 +1,287 @@+package controllers++import (+ "database/sql"+ "strconv"++ "github.com/Cawlumm/lyftr-backend/db"+ "github.com/Cawlumm/lyftr-backend/middleware"+ "github.com/Cawlumm/lyftr-backend/models"+ "github.com/Cawlumm/lyftr-backend/utils"+ "github.com/gin-gonic/gin"+)++func ListPrograms(c *gin.Context) {+ uid := middleware.UserID(c)++ rows, err := db.DB.Query(+ `SELECT id, user_id, name, notes, created_at FROM programs WHERE user_id = ? ORDER BY created_at DESC`,+ uid,+ )+ if err != nil {+ utils.InternalError(c)+ return+ }+ defer rows.Close()++ programs := []models.Program{}+ for rows.Next() {+ var p models.Program+ rows.Scan(&p.ID, &p.UserID, &p.Name, &p.Notes, &p.CreatedAt)+ p.Exercises = loadProgramExercises(p.ID)+ programs = append(programs, p)+ }+ utils.OK(c, programs)+}++func GetProgram(c *gin.Context) {+ uid := middleware.UserID(c)+ pid, err := strconv.ParseInt(c.Param("id"), 10, 64)+ if err != nil {+ utils.BadRequest(c, "invalid program id")+ return+ }++ var p models.Program+ err = db.DB.QueryRow(+ `SELECT id, user_id, name, notes, created_at FROM programs WHERE id = ? AND user_id = ?`, pid, uid,+ ).Scan(&p.ID, &p.UserID, &p.Name, &p.Notes, &p.CreatedAt)+ if err == sql.ErrNoRows {+ utils.NotFound(c, "program not found")+ return+ }+ if err != nil {+ utils.InternalError(c)+ return+ }++ p.Exercises = loadProgramExercises(pid)+ utils.OK(c, p)+}++func CreateProgram(c *gin.Context) {+ uid := middleware.UserID(c)+ var req models.CreateProgramRequest+ if err := c.ShouldBindJSON(&req); err != nil {+ utils.BadRequest(c, err.Error())+ return+ }+ if err := validate.Struct(req); err != nil {+ utils.ValidationError(c, err)+ return+ }++ tx, err := db.DB.Begin()+ if err != nil {+ utils.InternalError(c)+ return+ }+ defer tx.Rollback()++ res, err := tx.Exec(+ `INSERT INTO programs (user_id, name, notes) VALUES (?, ?, ?)`,+ uid, req.Name, req.Notes,+ )+ if err != nil {+ utils.InternalError(c)+ return+ }+ pid, _ := res.LastInsertId()++ for i, ex := range req.Exercises {+ exRes, err := tx.Exec(+ `INSERT INTO program_exercises (program_id, exercise_id, order_index, notes) VALUES (?, ?, ?, ?)`,+ pid, ex.ExerciseID, i, ex.Notes,+ )+ if err != nil {+ utils.InternalError(c)+ return+ }+ peid, _ := exRes.LastInsertId()+ for j, s := range ex.Sets {+ sn := s.SetNumber+ if sn == 0 {+ sn = j + 1+ }+ _, err := tx.Exec(+ `INSERT INTO program_sets (program_exercise_id, set_number, target_reps, target_weight) VALUES (?, ?, ?, ?)`,+ peid, sn, s.TargetReps, s.TargetWeight,+ )+ if err != nil {+ utils.InternalError(c)+ return+ }+ }+ }++ if err := tx.Commit(); err != nil {+ utils.InternalError(c)+ return+ }++ var p models.Program+ db.DB.QueryRow(+ `SELECT id, user_id, name, notes, created_at FROM programs WHERE id = ?`, pid,+ ).Scan(&p.ID, &p.UserID, &p.Name, &p.Notes, &p.CreatedAt)+ p.Exercises = loadProgramExercises(pid)+ utils.Created(c, p)+}++func UpdateProgram(c *gin.Context) {+ uid := middleware.UserID(c)+ pid, err := strconv.ParseInt(c.Param("id"), 10, 64)+ if err != nil {+ utils.BadRequest(c, "invalid program id")+ return+ }++ var req models.CreateProgramRequest+ if err := c.ShouldBindJSON(&req); err != nil {+ utils.BadRequest(c, err.Error())+ return+ }+ if err := validate.Struct(req); err != nil {+ utils.ValidationError(c, err)+ return+ }++ var existing models.Program+ err = db.DB.QueryRow(+ `SELECT id FROM programs WHERE id = ? AND user_id = ?`, pid, uid,+ ).Scan(&existing.ID)+ if err == sql.ErrNoRows {+ utils.NotFound(c, "program not found")+ return+ }+ if err != nil {+ utils.InternalError(c)+ return+ }++ tx, err := db.DB.Begin()+ if err != nil {+ utils.InternalError(c)+ return+ }+ defer tx.Rollback()++ _, err = tx.Exec(`UPDATE programs SET name = ?, notes = ? WHERE id = ?`, req.Name, req.Notes, pid)+ if err != nil {+ utils.InternalError(c)+ return+ }++ _, err = tx.Exec(`DELETE FROM program_exercises WHERE program_id = ?`, pid)+ if err != nil {+ utils.InternalError(c)+ return+ }++ for i, ex := range req.Exercises {+ exRes, err := tx.Exec(+ `INSERT INTO program_exercises (program_id, exercise_id, order_index, notes) VALUES (?, ?, ?, ?)`,+ pid, ex.ExerciseID, i, ex.Notes,+ )+ if err != nil {+ utils.InternalError(c)+ return+ }+ peid, _ := exRes.LastInsertId()+ for j, s := range ex.Sets {+ sn := s.SetNumber+ if sn == 0 {+ sn = j + 1+ }+ _, err := tx.Exec(+ `INSERT INTO program_sets (program_exercise_id, set_number, target_reps, target_weight) VALUES (?, ?, ?, ?)`,+ peid, sn, s.TargetReps, s.TargetWeight,+ )+ if err != nil {+ utils.InternalError(c)+ return+ }+ }+ }++ if err := tx.Commit(); err != nil {+ utils.InternalError(c)+ return+ }++ var p models.Program+ db.DB.QueryRow(+ `SELECT id, user_id, name, notes, created_at FROM programs WHERE id = ?`, pid,+ ).Scan(&p.ID, &p.UserID, &p.Name, &p.Notes, &p.CreatedAt)+ p.Exercises = loadProgramExercises(pid)+ utils.OK(c, p)+}++func DeleteProgram(c *gin.Context) {+ uid := middleware.UserID(c)+ pid, err := strconv.ParseInt(c.Param("id"), 10, 64)+ if err != nil {+ utils.BadRequest(c, "invalid program id")+ return+ }++ res, err := db.DB.Exec(`DELETE FROM programs WHERE id = ? AND user_id = ?`, pid, uid)+ if err != nil {+ utils.InternalError(c)+ return+ }+ n, _ := res.RowsAffected()+ if n == 0 {+ utils.NotFound(c, "program not found")+ return+ }+ utils.OK(c, gin.H{"deleted": true})+}++func loadProgramExercises(programID int64) []models.ProgramExercise {+ rows, err := db.DB.Query(+ `SELECT pe.id, pe.program_id, pe.exercise_id, pe.order_index, pe.notes,+ e.name, e.muscle_group, e.category, e.equipment, e.image_url+ FROM program_exercises pe+ JOIN exercises e ON e.id = pe.exercise_id+ WHERE pe.program_id = ? ORDER BY pe.order_index`,+ programID,+ )+ if err != nil {+ return nil+ }+ defer rows.Close()++ var exercises []models.ProgramExercise+ for rows.Next() {+ var pe models.ProgramExercise+ rows.Scan(+ &pe.ID, &pe.ProgramID, &pe.ExerciseID, &pe.OrderIndex, &pe.Notes,+ &pe.Exercise.Name, &pe.Exercise.MuscleGroup, &pe.Exercise.Category,+ &pe.Exercise.Equipment, &pe.Exercise.ImageURL,+ )+ pe.Exercise.ID = pe.ExerciseID+ pe.Sets = loadProgramSets(pe.ID)+ exercises = append(exercises, pe)+ }+ return exercises+}++func loadProgramSets(programExerciseID int64) []models.ProgramSet {+ rows, err := db.DB.Query(+ `SELECT id, program_exercise_id, set_number, target_reps, target_weight+ FROM program_sets WHERE program_exercise_id = ? ORDER BY set_number`,+ programExerciseID,+ )+ if err != nil {+ return nil+ }+ defer rows.Close()++ var sets []models.ProgramSet+ for rows.Next() {+ var s models.ProgramSet+ rows.Scan(&s.ID, &s.ProgramExerciseID, &s.SetNumber, &s.TargetReps, &s.TargetWeight)+ sets = append(sets, s)+ }+ return sets+}diff --git a/backend/controllers/workouts.go b/backend/controllers/workouts.goindex eed68ca..fc5eee6 100644--- a/backend/controllers/workouts.go+++ b/backend/controllers/workouts.go@@ -38,6 +38,7 @@ func ListWorkouts(c *gin.Context) {for rows.Next() {var w models.Workoutrows.Scan(&w.ID, &w.UserID, &w.Name, &w.Notes, &w.Duration, &w.StartedAt, &w.CreatedAt)+ w.Exercises = loadWorkoutExercises(w.ID)workouts = append(workouts, w)}utils.OK(c, workouts)@@ -85,7 +86,14 @@ func CreateWorkout(c *gin.Context) {req.StartedAt = time.Now()}- res, err := db.DB.Exec(+ tx, err := db.DB.Begin()+ if err != nil {+ utils.InternalError(c)+ return+ }+ defer tx.Rollback()++ res, err := tx.Exec(`INSERT INTO workouts (user_id, name, notes, duration, started_at) VALUES (?, ?, ?, ?, ?)`,uid, req.Name, req.Notes, req.Duration, req.StartedAt,)@@ -96,23 +104,35 @@ func CreateWorkout(c *gin.Context) {wid, _ := res.LastInsertId()for i, ex := range req.Exercises {- exRes, err := db.DB.Exec(+ exRes, err := tx.Exec(`INSERT INTO workout_exercises (workout_id, exercise_id, order_index, notes) VALUES (?, ?, ?, ?)`,wid, ex.ExerciseID, i, ex.Notes,)if err != nil {- continue+ tx.Rollback()+ utils.InternalError(c)+ return}weid, _ := exRes.LastInsertId()for j, s := range ex.Sets {- db.DB.Exec(+ _, err := tx.Exec(`INSERT INTO sets (workout_exercise_id, set_number, reps, weight, duration, distance, rpe, is_warmup)VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,weid, j+1, s.Reps, s.Weight, s.Duration, s.Distance, s.RPE, s.IsWarmup,)+ if err != nil {+ tx.Rollback()+ utils.InternalError(c)+ return+ }}}+ if err := tx.Commit(); err != nil {+ utils.InternalError(c)+ return+ }+var w models.Workoutdb.DB.QueryRow(`SELECT id, user_id, name, notes, duration, started_at, created_at FROM workouts WHERE id = ?`, wid,@@ -121,6 +141,97 @@ func CreateWorkout(c *gin.Context) {utils.Created(c, w)}+func UpdateWorkout(c *gin.Context) {+ uid := middleware.UserID(c)+ wid, err := strconv.ParseInt(c.Param("id"), 10, 64)+ if err != nil {+ utils.BadRequest(c, "invalid workout id")+ return+ }++ var req models.CreateWorkoutRequest+ if err := c.ShouldBindJSON(&req); err != nil {+ utils.BadRequest(c, err.Error())+ return+ }+ if err := validate.Struct(req); err != nil {+ utils.ValidationError(c, err)+ return+ }++ var existing models.Workout+ err = db.DB.QueryRow(+ `SELECT id, user_id FROM workouts WHERE id = ? AND user_id = ?`, wid, uid,+ ).Scan(&existing.ID, &existing.UserID)+ if err == sql.ErrNoRows {+ utils.NotFound(c, "workout not found")+ return+ }+ if err != nil {+ utils.InternalError(c)+ return+ }++ tx, err := db.DB.Begin()+ if err != nil {+ utils.InternalError(c)+ return+ }+ defer tx.Rollback()++ _, err = tx.Exec(+ `UPDATE workouts SET name = ?, notes = ?, duration = ?, started_at = ? WHERE id = ?`,+ req.Name, req.Notes, req.Duration, req.StartedAt, wid,+ )+ if err != nil {+ utils.InternalError(c)+ return+ }++ _, err = tx.Exec(`DELETE FROM workout_exercises WHERE workout_id = ?`, wid)+ if err != nil {+ utils.InternalError(c)+ return+ }++ for i, ex := range req.Exercises {+ exRes, err := tx.Exec(+ `INSERT INTO workout_exercises (workout_id, exercise_id, order_index, notes) VALUES (?, ?, ?, ?)`,+ wid, ex.ExerciseID, i, ex.Notes,+ )+ if err != nil {+ tx.Rollback()+ utils.InternalError(c)+ return+ }+ weid, _ := exRes.LastInsertId()+ for j, s := range ex.Sets {+ _, err := tx.Exec(+ `INSERT INTO sets (workout_exercise_id, set_number, reps, weight, duration, distance, rpe, is_warmup)+ VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,+ weid, j+1, s.Reps, s.Weight, s.Duration, s.Distance, s.RPE, s.IsWarmup,+ )+ if err != nil {+ tx.Rollback()+ utils.InternalError(c)+ return+ }+ }+ }++ if err := tx.Commit(); err != nil {+ utils.InternalError(c)+ return+ }++ var w models.Workout+ db.DB.QueryRow(+ `SELECT id, user_id, name, notes, duration, started_at, created_at FROM workouts WHERE id = ?`, wid,+ ).Scan(&w.ID, &w.UserID, &w.Name, &w.Notes, &w.Duration, &w.StartedAt, &w.CreatedAt)+ w.Exercises = loadWorkoutExercises(wid)+ utils.OK(c, w)+}+func DeleteWorkout(c *gin.Context) {uid := middleware.UserID(c)wid, err := strconv.ParseInt(c.Param("id"), 10, 64)diff --git a/backend/db/migrations.go b/backend/db/migrations.goindex 7019307..ffebe2f 100644--- a/backend/db/migrations.go+++ b/backend/db/migrations.go@@ -97,4 +97,36 @@ CREATE TABLE IF NOT EXISTS food_logs ();CREATE INDEX IF NOT EXISTS idx_food_logs_user ON food_logs(user_id, logged_at DESC);++CREATE TABLE IF NOT EXISTS active_sessions (+ id INTEGER PRIMARY KEY AUTOINCREMENT,+ user_id INTEGER NOT NULL UNIQUE REFERENCES users(id) ON DELETE CASCADE,+ data TEXT NOT NULL,+ updated_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP+);++CREATE TABLE IF NOT EXISTS programs (+ id INTEGER PRIMARY KEY AUTOINCREMENT,+ user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,+ name TEXT NOT NULL,+ notes TEXT NOT NULL DEFAULT '',+ created_at DATETIME NOT NULL DEFAULT CURRENT_TIMESTAMP+);+CREATE INDEX IF NOT EXISTS idx_programs_user ON programs(user_id);++CREATE TABLE IF NOT EXISTS program_exercises (+ id INTEGER PRIMARY KEY AUTOINCREMENT,+ program_id INTEGER NOT NULL REFERENCES programs(id) ON DELETE CASCADE,+ exercise_id INTEGER NOT NULL REFERENCES exercises(id),+ order_index INTEGER NOT NULL DEFAULT 0,+ notes TEXT NOT NULL DEFAULT ''+);++CREATE TABLE IF NOT EXISTS program_sets (+ id INTEGER PRIMARY KEY AUTOINCREMENT,+ program_exercise_id INTEGER NOT NULL REFERENCES program_exercises(id) ON DELETE CASCADE,+ set_number INTEGER NOT NULL DEFAULT 1,+ target_reps INTEGER NOT NULL DEFAULT 0,+ target_weight REAL NOT NULL DEFAULT 0+);`diff --git a/backend/db/sqlite.go b/backend/db/sqlite.goindex 97b5e72..edfd05b 100644--- a/backend/db/sqlite.go+++ b/backend/db/sqlite.go@@ -21,13 +21,13 @@ func Connect() {}var err error- DB, err = sql.Open("sqlite", dbPath+"?_journal_mode=WAL&_foreign_keys=on")+ DB, err = sql.Open("sqlite", dbPath+"?_journal_mode=DELETE&_foreign_keys=on&_busy_timeout=5000")if err != nil {log.Fatalf("failed to open database: %v", err)}- DB.SetMaxOpenConns(1) // SQLite is single-writer- DB.SetMaxIdleConns(1)+ DB.SetMaxOpenConns(10)+ DB.SetMaxIdleConns(5)if err = DB.Ping(); err != nil {log.Fatalf("failed to ping database: %v", err)diff --git a/backend/main.go b/backend/main.goindex 3ef5c2e..690dadc 100644--- a/backend/main.go+++ b/backend/main.go@@ -13,6 +13,7 @@ import (func main() {config.Load()db.Connect()+ seed.DemoUser(db.DB)seed.Exercises(db.DB)if config.C.Env == "production" {diff --git a/backend/models/models.go b/backend/models/models.goindex a2eb840..f75dd98 100644--- a/backend/models/models.go+++ b/backend/models/models.go@@ -163,6 +163,51 @@ type UpdateSettingsRequest struct {FatTarget int `json:"fat_target" validate:"omitempty,gte=0"`}+type Program struct {+ ID int64 `json:"id"`+ UserID int64 `json:"user_id,omitempty"`+ Name string `json:"name"`+ Notes string `json:"notes"`+ CreatedAt time.Time `json:"created_at"`+ Exercises []ProgramExercise `json:"exercises"`+}++type ProgramExercise struct {+ ID int64 `json:"id,omitempty"`+ ProgramID int64 `json:"program_id,omitempty"`+ ExerciseID int64 `json:"exercise_id"`+ OrderIndex int `json:"order_index,omitempty"`+ Notes string `json:"notes"`+ Exercise Exercise `json:"exercise"`+ Sets []ProgramSet `json:"sets"`+}++type ProgramSet struct {+ ID int64 `json:"id,omitempty"`+ ProgramExerciseID int64 `json:"program_exercise_id,omitempty"`+ SetNumber int `json:"set_number"`+ TargetReps int `json:"target_reps"`+ TargetWeight float64 `json:"target_weight"`+}++type CreateProgramRequest struct {+ Name string `json:"name" validate:"required"`+ Notes string `json:"notes"`+ Exercises []CreateProgramExerciseReq `json:"exercises"`+}++type CreateProgramExerciseReq struct {+ ExerciseID int64 `json:"exercise_id" validate:"required"`+ Notes string `json:"notes"`+ Sets []CreateProgramSetReq `json:"sets"`+}++type CreateProgramSetReq struct {+ SetNumber int `json:"set_number"`+ TargetReps int `json:"target_reps"`+ TargetWeight float64 `json:"target_weight"`+}+type DailyStats struct {Date string `json:"date"`TotalCalories float64 `json:"total_calories"`diff --git a/backend/routes/routes.go b/backend/routes/routes.goindex b8e44f6..d7eab68 100644--- a/backend/routes/routes.go+++ b/backend/routes/routes.go@@ -9,11 +9,15 @@ import ()func Setup(r *gin.Engine) {+ corsOrigins := []string{config.C.CORSOrigin}+ if config.C.Env == "development" {+ corsOrigins = []string{"*"}+ }r.Use(cors.New(cors.Config{- AllowOrigins: []string{config.C.CORSOrigin},+ AllowOrigins: corsOrigins,AllowMethods: []string{"GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS"},AllowHeaders: []string{"Origin", "Content-Type", "Authorization"},- AllowCredentials: true,+ AllowCredentials: config.C.Env != "development",}))r.GET("/health", func(c *gin.Context) {@@ -44,6 +48,7 @@ func Setup(r *gin.Engine) {protected.GET("workouts", controllers.ListWorkouts)protected.POST("workouts", controllers.CreateWorkout)protected.GET("workouts/:id", controllers.GetWorkout)+ protected.PUT("workouts/:id", controllers.UpdateWorkout)protected.DELETE("workouts/:id", controllers.DeleteWorkout)// Weight@@ -62,6 +67,18 @@ func Setup(r *gin.Engine) {protected.GET("exercises", controllers.ListExercises)protected.GET("exercises/:id", controllers.GetExercise)+ // Active session+ protected.GET("active-session", controllers.GetActiveSession)+ protected.PUT("active-session", controllers.UpsertActiveSession)+ protected.DELETE("active-session", controllers.DeleteActiveSession)++ // Programs+ protected.GET("programs", controllers.ListPrograms)+ protected.POST("programs", controllers.CreateProgram)+ protected.GET("programs/:id", controllers.GetProgram)+ protected.PUT("programs/:id", controllers.UpdateProgram)+ protected.DELETE("programs/:id", controllers.DeleteProgram)+// Adminprotected.POST("admin/sync-exercises", controllers.SyncExercises)}diff --git a/backend/seed/exercises.go b/backend/seed/exercises.goindex aaaad88..6e9b8c6 100644--- a/backend/seed/exercises.go+++ b/backend/seed/exercises.go@@ -30,7 +30,7 @@ type freeExerciseItem struct {Images []string `json:"images"`}-// Exercises seeds on first run if the table is empty.+// Exercises seeds on first run if the table is empty (async to avoid blocking startup).func Exercises(db *sql.DB) {var count intdb.QueryRow(`SELECT COUNT(*) FROM exercises`).Scan(&count)@@ -39,9 +39,14 @@ func Exercises(db *sql.DB) {return}- log.Println("seed: fetching exercises from free-exercise-db...")+ log.Println("seed: exercises table empty - syncing from free-exercise-db in background...")+ go fetchAndStoreAsync(db)+}++func fetchAndStoreAsync(db *sql.DB) {if err := fetchAndStore(db); err != nil {log.Printf("seed: exercise sync failed: %v", err)+ return}}diff --git a/backend/seed/users.go b/backend/seed/users.gonew file mode 100644index 0000000..48991a4--- /dev/null+++ b/backend/seed/users.go@@ -0,0 +1,32 @@+package seed++import (+ "database/sql"+ "log"++ "github.com/Cawlumm/lyftr-backend/utils"+)++func DemoUser(db *sql.DB) {+ var count int+ db.QueryRow(`SELECT COUNT(*) FROM users WHERE email = ?`, "[email protected]").Scan(&count)+ if count > 0 {+ return+ }++ hash, err := utils.HashPassword("password123")+ if err != nil {+ log.Printf("seed: failed to hash password: %v", err)+ return+ }++ res, err := db.Exec(`INSERT INTO users (email, password_hash) VALUES (?, ?)`, "[email protected]", hash)+ if err != nil {+ log.Printf("seed: failed to create demo user: %v", err)+ return+ }++ userID, _ := res.LastInsertId()+ db.Exec(`INSERT INTO user_settings (user_id) VALUES (?)`, userID)+ log.Println("seed: demo user created ([email protected] / password123)")+}diff --git a/web/src/App.tsx b/web/src/App.tsxindex cca9df7..e026914 100644--- a/web/src/App.tsx+++ b/web/src/App.tsx@@ -1,8 +1,12 @@import { BrowserRouter, Routes, Route, Navigate } from 'react-router-dom'+import { useEffect } from 'react'import { useAuthStore } from './stores/auth'+import { useWorkoutSession } from './stores/workoutSession'import Layout from './components/Layout'import Dashboard from './pages/Dashboard'import Workouts from './pages/Workouts'+import Programs from './pages/Programs'+import ActiveWorkout from './pages/ActiveWorkout'import Food from './pages/Food'import Weight from './pages/Weight'import Settings from './pages/Settings'@@ -11,6 +15,11 @@ import Register from './pages/Register'function App() {const { isAuthenticated } = useAuthStore()+ const { restoreFromServer } = useWorkoutSession()++ useEffect(() => {+ if (isAuthenticated) restoreFromServer()+ }, [isAuthenticated])return (<BrowserRouter>@@ -24,6 +33,8 @@ function App() {<Route element={<Layout />}><Route path="/" element={<Dashboard />} /><Route path="/workouts" element={<Workouts />} />+ <Route path="/programs" element={<Programs />} />+ <Route path="/workout/active" element={<ActiveWorkout />} /><Route path="/food" element={<Food />} /><Route path="/weight" element={<Weight />} /><Route path="/settings" element={<Settings />} />diff --git a/web/src/components/AddProgramModal.tsx b/web/src/components/AddProgramModal.tsxnew file mode 100644index 0000000..b05859c--- /dev/null+++ b/web/src/components/AddProgramModal.tsx@@ -0,0 +1,317 @@+import { useState } from 'react'+import { createPortal } from 'react-dom'+import { Plus, X, Trash2, AlertCircle, BookOpen, FileText, Zap, Target } from 'lucide-react'+import { programAPI } from '../services/api'+import ExercisePicker from './ExercisePicker'+import * as types from '../types'++interface ProgramFormData {+ name: string+ notes: string+ exercises: {+ exercise_id: number+ notes: string+ sets: { set_number: number; target_reps: number; target_weight: number }[]+ }[]+}++interface Props {+ isOpen: boolean+ onClose: () => void+ onSuccess: () => void+}++export default function AddProgramModal({ isOpen, onClose, onSuccess }: Props) {+ const [showPicker, setShowPicker] = useState(false)+ const [loading, setLoading] = useState(false)+ const [error, setError] = useState('')+ const [pickerExercises, setPickerExercises] = useState<Record<number, types.Exercise>>({})+ const [formData, setFormData] = useState<ProgramFormData>({ name: '', notes: '', exercises: [] })++ const addExercise = (exercise: types.Exercise) => {+ setPickerExercises(prev => ({ ...prev, [exercise.id]: exercise }))+ setFormData(prev => ({+ ...prev,+ exercises: [...prev.exercises, {+ exercise_id: exercise.id,+ notes: '',+ sets: [{ set_number: 1, target_reps: 0, target_weight: 0 }],+ }],+ }))+ setShowPicker(false)+ setError('')+ }++ const removeExercise = (index: number) => {+ setFormData(prev => ({ ...prev, exercises: prev.exercises.filter((_, i) => i !== index) }))+ }++ const addSet = (exIdx: number) => {+ setFormData(prev => {+ const exercises = [...prev.exercises]+ const count = exercises[exIdx].sets.length + 1+ exercises[exIdx].sets.push({ set_number: count, target_reps: 0, target_weight: 0 })+ return { ...prev, exercises }+ })+ }++ const removeSet = (exIdx: number, setIdx: number) => {+ setFormData(prev => {+ const exercises = [...prev.exercises]+ exercises[exIdx].sets = exercises[exIdx].sets.filter((_, i) => i !== setIdx)+ return { ...prev, exercises }+ })+ }++ const updateSet = (exIdx: number, setIdx: number, field: string, value: any) => {+ setFormData(prev => {+ const exercises = [...prev.exercises]+ ;(exercises[exIdx].sets[setIdx] as any)[field] = Number(value) || 0+ return { ...prev, exercises }+ })+ }++ const handleSubmit = async (e: React.FormEvent) => {+ e.preventDefault()+ if (!formData.name.trim()) { setError('Program name required'); return }+ if (formData.exercises.length === 0) { setError('Add at least one exercise'); return }++ setLoading(true)+ try {+ await programAPI.create(formData)+ setFormData({ name: '', notes: '', exercises: [] })+ setPickerExercises({})+ onSuccess()+ onClose()+ } catch (err: any) {+ setError(err.response?.data?.error || 'Failed to create program')+ } finally {+ setLoading(false)+ }+ }++ if (!isOpen) return null++ const selectedIds = formData.exercises.map(e => e.exercise_id)+ const totalSets = formData.exercises.reduce((sum, ex) => sum + ex.sets.length, 0)++ return createPortal((+ <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">+ <div className="bg-surface-base border border-surface-border rounded-2xl w-full max-h-[90vh] sm:max-w-2xl overflow-y-auto">+ <div className="sticky top-0 border-b border-surface-border bg-surface-base px-5 py-4 flex items-center justify-between">+ <div>+ <h2 className="font-display font-bold text-xl text-tx-primary">New Program</h2>+ <p className="text-xs text-tx-muted mt-1">{formData.exercises.length} exercises • {totalSets} sets</p>+ </div>+ <button onClick={onClose} className="p-1 hover:bg-surface-muted rounded-lg transition-colors">+ <X className="w-5 h-5 text-tx-muted" />+ </button>+ </div>++ <form onSubmit={handleSubmit} className="p-5 space-y-6">+ {error && (+ <div className="alert-error">+ <AlertCircle className="w-4 h-4 flex-shrink-0" />+ <span>{error}</span>+ </div>+ )}++ <div>+ <div className="flex items-center gap-2 mb-2">+ <BookOpen className="w-4 h-4 text-brand-500" />+ <label className="label">Program Name</label>+ <span className="text-xs text-tx-muted">(required)</span>+ </div>+ <input+ type="text"+ value={formData.name}+ onChange={e => setFormData(prev => ({ ...prev, name: e.target.value }))}+ placeholder="e.g., Push Pull Legs, Upper Lower"+ className="input mt-1"+ />+ </div>++ <div>+ <div className="flex items-center gap-2 mb-2">+ <FileText className="w-4 h-4 text-brand-500" />+ <label className="label">Notes</label>+ </div>+ <textarea+ value={formData.notes}+ onChange={e => setFormData(prev => ({ ...prev, notes: e.target.value }))}+ placeholder="Program description or goals…"+ className="input mt-1 min-h-16 resize-none"+ />+ </div>++ {formData.exercises.length > 0 && (+ <div className="grid grid-cols-2 gap-2 p-3 bg-brand-500/10 border border-brand-500/20 rounded-lg">+ <div className="text-center">+ <div className="flex items-center justify-center gap-1 mb-1">+ <Zap className="w-3.5 h-3.5 text-brand-500" />+ </div>+ <div className="text-sm font-bold text-brand-500">{formData.exercises.length}</div>+ <div className="text-xs text-tx-muted">Exercises</div>+ </div>+ <div className="text-center">+ <div className="flex items-center justify-center gap-1 mb-1">+ <Target className="w-3.5 h-3.5 text-brand-500" />+ </div>+ <div className="text-sm font-bold text-brand-500">{totalSets}</div>+ <div className="text-xs text-tx-muted">Target Sets</div>+ </div>+ </div>+ )}++ <div>+ <div className="flex items-center justify-between mb-3">+ <div className="flex items-center gap-2">+ <Zap className="w-4 h-4 text-brand-500" />+ <label className="label">Exercises</label>+ <span className="text-xs text-tx-muted">(required)</span>+ </div>+ <button+ type="button"+ onClick={() => setShowPicker(true)}+ className="flex items-center gap-1.5 px-3 py-1.5 text-xs bg-brand-500 hover:bg-brand-600 text-white rounded-lg transition-colors font-medium"+ >+ <Plus className="w-3.5 h-3.5" />+ Add Exercise+ </button>+ </div>++ {showPicker && (+ <ExercisePicker+ selectedIds={selectedIds}+ onSelect={addExercise}+ onClose={() => setShowPicker(false)}+ />+ )}++ <div className="space-y-4">+ {formData.exercises.map((workoutEx, exIdx) => {+ const exercise = pickerExercises[workoutEx.exercise_id]+ return (+ <div key={exIdx} className="p-4 bg-surface-muted/30 border border-surface-border rounded-lg">+ <div className="flex items-start justify-between mb-4">+ <div className="flex-1">+ <div className="flex items-center gap-2 mb-1">+ <div className="w-6 h-6 rounded bg-brand-500/20 flex items-center justify-center flex-shrink-0">+ <span className="text-xs font-bold text-brand-500">{exIdx + 1}</span>+ </div>+ <p className="font-semibold text-tx-primary">{exercise?.name}</p>+ </div>+ <p className="text-xs text-tx-muted ml-8">{exercise?.muscle_group} • {exercise?.equipment}</p>+ </div>+ <button+ type="button"+ onClick={() => removeExercise(exIdx)}+ className="p-1.5 hover:bg-error-500/20 rounded transition-colors flex-shrink-0"+ >+ <Trash2 className="w-4 h-4 text-error-400" />+ </button>+ </div>++ <div className="mb-4">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">Notes</label>+ <input+ type="text"+ value={workoutEx.notes}+ onChange={e => {+ const exercises = [...formData.exercises]+ exercises[exIdx].notes = e.target.value+ setFormData(prev => ({ ...prev, exercises }))+ }}+ placeholder="e.g., Focus on controlled eccentric"+ className="input text-sm"+ />+ </div>++ <div className="space-y-2 mb-3">+ <div className="flex items-center justify-between">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider">Target Sets</label>+ <span className="text-xs text-tx-muted">{workoutEx.sets.length} sets</span>+ </div>+ {workoutEx.sets.map((set, setIdx) => (+ <div key={setIdx} className="flex gap-2 items-end bg-surface-raised/40 p-3 rounded-lg border border-surface-border/50">+ <div className="flex-shrink-0 w-12">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block">Set</label>+ <div className="text-sm font-bold text-tx-primary bg-surface-muted px-2 py-1 rounded text-center">+ {set.set_number}+ </div>+ </div>+ <div className="flex-1 min-w-0">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">Target Reps</label>+ <input+ type="number"+ inputMode="numeric"+ value={set.target_reps || ''}+ onChange={e => updateSet(exIdx, setIdx, 'target_reps', e.target.value)}+ placeholder="10"+ className="input text-sm w-full"+ min="0"+ />+ </div>+ <div className="flex-1 min-w-0">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">Target Weight</label>+ <div className="relative">+ <input+ type="number"+ inputMode="decimal"+ value={set.target_weight || ''}+ onChange={e => updateSet(exIdx, setIdx, 'target_weight', e.target.value)}+ placeholder="135"+ className="input text-sm w-full pr-7"+ min="0"+ step="0.5"+ />+ <span className="absolute right-2 top-1/2 -translate-y-1/2 text-xs text-tx-muted font-medium pointer-events-none">lbs</span>+ </div>+ </div>+ <button+ type="button"+ onClick={() => removeSet(exIdx, setIdx)}+ className="p-2 hover:bg-error-500/20 rounded transition-colors flex-shrink-0"+ >+ <Trash2 className="w-4 h-4 text-error-400" />+ </button>+ </div>+ ))}+ </div>++ <button+ type="button"+ onClick={() => addSet(exIdx)}+ className="flex items-center gap-1 text-xs text-brand-400 hover:text-brand-300 font-medium transition-colors"+ >+ <Plus className="w-3.5 h-3.5" />+ Add Set+ </button>+ </div>+ )+ })}+ </div>+ </div>++ <div className="flex gap-3 sticky bottom-0 bg-surface-base pt-4 border-t border-surface-border -mx-5 px-5 pb-5">+ <button+ type="button"+ onClick={onClose}+ className="flex-1 px-4 py-3 bg-surface-muted hover:bg-surface-muted/80 text-tx-secondary rounded-lg transition-colors font-medium"+ >+ Cancel+ </button>+ <button+ type="submit"+ disabled={loading}+ className="flex-1 px-4 py-3 bg-brand-500 hover:bg-brand-600 disabled:opacity-40 disabled:cursor-not-allowed text-white font-medium rounded-lg transition-colors flex items-center justify-center gap-2"+ >+ <BookOpen className="w-4 h-4" />+ {loading ? 'Saving…' : 'Save Program'}+ </button>+ </div>+ </form>+ </div>+ </div>+ ), document.body)+}diff --git a/web/src/components/AddWorkoutModal.tsx b/web/src/components/AddWorkoutModal.tsxnew file mode 100644index 0000000..25cf602--- /dev/null+++ b/web/src/components/AddWorkoutModal.tsx@@ -0,0 +1,443 @@+import { useState } from 'react'+import { createPortal } from 'react-dom'+import { Plus, X, Trash2, AlertCircle, Dumbbell, Clock, FileText, Zap, Target, Gauge, BookOpen } from 'lucide-react'+import { workoutAPI } from '../services/api'+import ExercisePicker from './ExercisePicker'+import ProgramPicker from './ProgramPicker'+import * as types from '../types'++interface WorkoutFormData {+ name: string+ notes: string+ duration: number+ exercises: {+ exercise_id: number+ notes: string+ sets: {+ set_number: number+ reps: number+ weight: number+ }[]+ }[]+}++interface Props {+ isOpen: boolean+ onClose: () => void+ onSuccess: () => void+}++export default function AddWorkoutModal({ isOpen, onClose, onSuccess }: Props) {+ const [showPicker, setShowPicker] = useState(false)+ const [showProgramPicker, setShowProgramPicker] = useState(false)+ const [loading, setLoading] = useState(false)+ const [error, setError] = useState('')+ const [pickerExercises, setPickerExercises] = useState<Record<number, types.Exercise>>({})++ const cacheExercise = (ex: types.Exercise) => {+ setPickerExercises(prev => ({ ...prev, [ex.id]: ex }))+ }++ const [formData, setFormData] = useState<WorkoutFormData>({+ name: '',+ notes: '',+ duration: 0,+ exercises: [],+ })++ const loadFromProgram = (program: types.Program) => {+ const newMap: Record<number, types.Exercise> = { ...pickerExercises }+ const newExercises = (program.exercises || []).map(ex => {+ newMap[ex.exercise_id] = ex.exercise+ return {+ exercise_id: ex.exercise_id,+ notes: ex.notes || '',+ sets: (ex.sets || []).map(s => ({+ set_number: s.set_number,+ reps: s.target_reps,+ weight: s.target_weight,+ })),+ }+ })+ setPickerExercises(newMap)+ setFormData(prev => ({ ...prev, exercises: newExercises }))+ setShowProgramPicker(false)+ setError('')+ }++ const addExercise = (exercise: types.Exercise) => {+ cacheExercise(exercise)+ setFormData({+ ...formData,+ exercises: [+ ...formData.exercises,+ {+ exercise_id: exercise.id,+ notes: '',+ sets: [{ set_number: 1, reps: 0, weight: 0 }],+ },+ ],+ })+ setShowPicker(false)+ setError('')+ }++ const removeExercise = (index: number) => {+ setFormData({+ ...formData,+ exercises: formData.exercises.filter((_, i) => i !== index),+ })+ }++ const addSet = (exerciseIndex: number) => {+ const newExercises = [...formData.exercises]+ const setCount = newExercises[exerciseIndex].sets.length + 1+ newExercises[exerciseIndex].sets.push({+ set_number: setCount,+ reps: 0,+ weight: 0,+ })+ setFormData({ ...formData, exercises: newExercises })+ }++ const removeSet = (exerciseIndex: number, setIndex: number) => {+ const newExercises = [...formData.exercises]+ newExercises[exerciseIndex].sets = newExercises[exerciseIndex].sets.filter((_, i) => i !== setIndex)+ setFormData({ ...formData, exercises: newExercises })+ }++ const updateSet = (exerciseIndex: number, setIndex: number, field: string, value: any) => {+ const newExercises = [...formData.exercises]+ ;(newExercises[exerciseIndex].sets[setIndex] as any)[field] = field === 'reps' || field === 'weight' ? Number(value) || 0 : value+ setFormData({ ...formData, exercises: newExercises })+ }++ const handleSubmit = async (e: React.FormEvent) => {+ e.preventDefault()+ if (!formData.name.trim()) {+ setError('Workout name required')+ return+ }+ if (formData.exercises.length === 0) {+ setError('Add at least one exercise')+ return+ }++ setLoading(true)+ try {+ await workoutAPI.create({+ name: formData.name,+ notes: formData.notes,+ duration: formData.duration,+ exercises: formData.exercises,+ started_at: new Date().toISOString(),+ })+ setFormData({ name: '', notes: '', duration: 0, exercises: [] })+ onSuccess()+ onClose()+ } catch (err: any) {+ setError(err.response?.data?.error || 'Failed to create workout')+ } finally {+ setLoading(false)+ }+ }++ if (!isOpen) return null++ const selectedExerciseIds = formData.exercises.map(e => e.exercise_id)+ const totalSets = formData.exercises.reduce((sum, ex) => sum + ex.sets.length, 0)+ const totalWeight = formData.exercises.reduce((sum, ex) => sum + ex.sets.reduce((s, set) => s + (set.weight || 0), 0), 0)++ return createPortal((+ <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">+ <div className="bg-surface-base border border-surface-border rounded-2xl w-full max-h-[90vh] sm:max-w-2xl overflow-y-auto">+ {/* Header */}+ <div className="sticky top-0 border-b border-surface-border bg-surface-base px-5 py-4 flex items-center justify-between">+ <div>+ <h2 className="font-display font-bold text-xl text-tx-primary">Log Workout</h2>+ <p className="text-xs text-tx-muted mt-1">{formData.exercises.length} exercises • {totalSets} sets</p>+ </div>+ <button onClick={onClose} className="p-1 hover:bg-surface-muted rounded-lg transition-colors">+ <X className="w-5 h-5 text-tx-muted" />+ </button>+ </div>++ {/* Content */}+ <form onSubmit={handleSubmit} className="p-5 space-y-6">+ {error && (+ <div className="alert-error">+ <AlertCircle className="w-4 h-4 flex-shrink-0" />+ <span>{error}</span>+ </div>+ )}++ {/* Workout name */}+ <div>+ <div className="flex items-center gap-2 mb-2">+ <Dumbbell className="w-4 h-4 text-brand-500" />+ <label className="label">Workout Name</label>+ <span className="text-xs text-tx-muted">(required)</span>+ </div>+ <input+ type="text"+ value={formData.name}+ onChange={e => setFormData({ ...formData, name: e.target.value })}+ placeholder="e.g., Leg Day, Push Day, Cardio Session"+ className="input mt-1"+ />+ </div>++ {/* Duration */}+ <div>+ <div className="flex items-center gap-2 mb-2">+ <Clock className="w-4 h-4 text-brand-500" />+ <label className="label">Duration</label>+ </div>+ <div className="grid grid-cols-2 gap-3">+ <div>+ <label className="text-xs text-tx-muted font-medium block mb-1">Minutes</label>+ <input+ type="number"+ value={formData.duration || ''}+ onChange={e => setFormData({ ...formData, duration: Number(e.target.value) || 0 })}+ placeholder="0"+ className="input w-full"+ min="0"+ />+ </div>+ <div className="flex items-end">+ <div className="text-sm text-tx-muted py-2 px-3 bg-surface-muted/30 rounded-lg w-full text-center font-medium">+ {Math.floor(formData.duration / 60)}h {formData.duration % 60}m+ </div>+ </div>+ </div>+ </div>++ {/* Notes */}+ <div>+ <div className="flex items-center gap-2 mb-2">+ <FileText className="w-4 h-4 text-brand-500" />+ <label className="label">Notes</label>+ </div>+ <textarea+ value={formData.notes}+ onChange={e => setFormData({ ...formData, notes: e.target.value })}+ placeholder="How did it feel? Any PRs? Energy level?"+ className="input mt-1 min-h-20 resize-none"+ />+ </div>++ {/* Workout Summary */}+ {formData.exercises.length > 0 && (+ <div className="grid grid-cols-3 gap-2 p-3 bg-brand-500/10 border border-brand-500/20 rounded-lg">+ <div className="text-center">+ <div className="flex items-center justify-center gap-1 mb-1">+ <Zap className="w-3.5 h-3.5 text-brand-500" />+ </div>+ <div className="text-sm font-bold text-brand-500">{formData.exercises.length}</div>+ <div className="text-xs text-tx-muted">Exercises</div>+ </div>+ <div className="text-center">+ <div className="flex items-center justify-center gap-1 mb-1">+ <Target className="w-3.5 h-3.5 text-brand-500" />+ </div>+ <div className="text-sm font-bold text-brand-500">{totalSets}</div>+ <div className="text-xs text-tx-muted">Sets</div>+ </div>+ <div className="text-center">+ <div className="flex items-center justify-center gap-1 mb-1">+ <Gauge className="w-3.5 h-3.5 text-brand-500" />+ </div>+ <div className="text-sm font-bold text-brand-500">{Math.round(totalWeight)}</div>+ <div className="text-xs text-tx-muted">Total lbs</div>+ </div>+ </div>+ )}++ {/* Exercises */}+ <div>+ <div className="flex items-center justify-between mb-3">+ <div className="flex items-center gap-2">+ <Zap className="w-4 h-4 text-brand-500" />+ <label className="label">Exercises</label>+ <span className="text-xs text-tx-muted">(required)</span>+ </div>+ <div className="flex items-center gap-2">+ <button+ type="button"+ onClick={() => setShowProgramPicker(true)}+ className="flex items-center gap-1.5 px-3 py-1.5 text-xs bg-surface-muted hover:bg-surface-muted/80 text-tx-secondary border border-surface-border rounded-lg transition-colors font-medium"+ >+ <BookOpen className="w-3.5 h-3.5" />+ Load Program+ </button>+ <button+ type="button"+ onClick={() => setShowPicker(true)}+ className="flex items-center gap-1.5 px-3 py-1.5 text-xs bg-brand-500 hover:bg-brand-600 text-white rounded-lg transition-colors font-medium"+ >+ <Plus className="w-3.5 h-3.5" />+ Add Exercise+ </button>+ </div>+ </div>++ {showPicker && (+ <ExercisePicker+ selectedIds={selectedExerciseIds}+ onSelect={addExercise}+ onClose={() => setShowPicker(false)}+ />+ )}++ {showProgramPicker && (+ <ProgramPicker+ onSelect={loadFromProgram}+ onClose={() => setShowProgramPicker(false)}+ />+ )}++ {/* Selected exercises */}+ <div className="space-y-4">+ {formData.exercises.map((workoutEx, exIdx) => {+ const exercise = pickerExercises[workoutEx.exercise_id]+ return (+ <div key={exIdx} className="p-4 bg-surface-muted/30 border border-surface-border rounded-lg">+ {/* Exercise header */}+ <div className="flex items-start justify-between mb-4">+ <div className="flex-1">+ <div className="flex items-center gap-2 mb-1">+ <div className="w-6 h-6 rounded bg-brand-500/20 flex items-center justify-center flex-shrink-0">+ <span className="text-xs font-bold text-brand-500">{exIdx + 1}</span>+ </div>+ <p className="font-semibold text-tx-primary">{exercise?.name}</p>+ </div>+ <p className="text-xs text-tx-muted ml-8">{exercise?.muscle_group} • {exercise?.equipment}</p>+ </div>+ <button+ type="button"+ onClick={() => removeExercise(exIdx)}+ className="p-1.5 hover:bg-error-500/20 rounded transition-colors flex-shrink-0"+ title="Remove exercise"+ >+ <Trash2 className="w-4 h-4 text-error-400" />+ </button>+ </div>++ {/* Exercise notes */}+ <div className="mb-4">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">Notes</label>+ <input+ type="text"+ value={workoutEx.notes}+ onChange={e => {+ const newExercises = [...formData.exercises]+ newExercises[exIdx].notes = e.target.value+ setFormData({ ...formData, exercises: newExercises })+ }}+ placeholder="e.g., Felt strong, good form"+ className="input text-sm"+ />+ </div>++ {/* Sets */}+ <div className="space-y-2 mb-3">+ <div className="flex items-center justify-between">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider">Sets</label>+ <span className="text-xs text-tx-muted">{workoutEx.sets.length} sets</span>+ </div>+ {workoutEx.sets.map((set, setIdx) => (+ <div key={setIdx} className="flex gap-2 items-end bg-surface-raised/40 p-3 rounded-lg border border-surface-border/50">+ {/* Set number */}+ <div className="flex-shrink-0 w-12">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block">Set</label>+ <div className="text-sm font-bold text-tx-primary bg-surface-muted px-2 py-1 rounded text-center">+ {set.set_number}+ </div>+ </div>++ {/* Reps */}+ <div className="flex-1 min-w-0">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">Reps</label>+ <input+ type="number"+ inputMode="numeric"+ value={set.reps || ''}+ onChange={e => updateSet(exIdx, setIdx, 'reps', e.target.value)}+ placeholder="10"+ className="input text-sm w-full"+ min="0"+ />+ </div>++ {/* Weight */}+ <div className="flex-1 min-w-0">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">Weight</label>+ <div className="relative">+ <input+ type="number"+ inputMode="decimal"+ value={set.weight || ''}+ onChange={e => updateSet(exIdx, setIdx, 'weight', e.target.value)}+ placeholder="225"+ className="input text-sm w-full pr-7"+ min="0"+ step="0.5"+ />+ <span className="absolute right-2 top-1/2 -translate-y-1/2 text-xs text-tx-muted font-medium pointer-events-none">+ lbs+ </span>+ </div>+ </div>++ {/* Remove set button */}+ <button+ type="button"+ onClick={() => removeSet(exIdx, setIdx)}+ className="p-2 hover:bg-error-500/20 rounded transition-colors flex-shrink-0"+ title="Remove set"+ >+ <Trash2 className="w-4 h-4 text-error-400" />+ </button>+ </div>+ ))}+ </div>++ {/* Add set button */}+ <button+ type="button"+ onClick={() => addSet(exIdx)}+ className="flex items-center gap-1 text-xs text-brand-400 hover:text-brand-300 font-medium transition-colors"+ >+ <Plus className="w-3.5 h-3.5" />+ Add Set+ </button>+ </div>+ )+ })}+ </div>+ </div>++ {/* Submit buttons */}+ <div className="flex gap-3 sticky bottom-0 bg-surface-base pt-4 border-t border-surface-border -mx-5 px-5 pb-5">+ <button+ type="button"+ onClick={onClose}+ className="flex-1 px-4 py-3 bg-surface-muted hover:bg-surface-muted/80 text-tx-secondary rounded-lg transition-colors font-medium"+ >+ Cancel+ </button>+ <button+ type="submit"+ disabled={loading}+ className="flex-1 px-4 py-3 bg-brand-500 hover:bg-brand-600 disabled:opacity-40 disabled:cursor-not-allowed text-white font-medium rounded-lg transition-colors flex items-center justify-center gap-2"+ >+ <Dumbbell className="w-4 h-4" />+ {loading ? 'Saving…' : 'Save Workout'}+ </button>+ </div>+ </form>+ </div>+ </div>+ ), document.body)+}diff --git a/web/src/components/EditProgramModal.tsx b/web/src/components/EditProgramModal.tsxnew file mode 100644index 0000000..278ea69--- /dev/null+++ b/web/src/components/EditProgramModal.tsx@@ -0,0 +1,304 @@+import { useState, useEffect } from 'react'+import { createPortal } from 'react-dom'+import { Plus, X, Trash2, AlertCircle, BookOpen, FileText, Zap, Target } from 'lucide-react'+import { programAPI } from '../services/api'+import ExercisePicker from './ExercisePicker'+import * as types from '../types'++interface ProgramFormData {+ name: string+ notes: string+ exercises: {+ exercise_id: number+ notes: string+ sets: { set_number: number; target_reps: number; target_weight: number }[]+ }[]+}++interface Props {+ isOpen: boolean+ onClose: () => void+ onSuccess: () => void+ programId: number+}++export default function EditProgramModal({ isOpen, onClose, onSuccess, programId }: Props) {+ const [pickerExercises, setPickerExercises] = useState<Record<number, types.Exercise>>({})+ const [showPicker, setShowPicker] = useState(false)+ const [loading, setLoading] = useState(false)+ const [initialLoading, setInitialLoading] = useState(false)+ const [error, setError] = useState('')+ const [formData, setFormData] = useState<ProgramFormData>({ name: '', notes: '', exercises: [] })++ useEffect(() => {+ if (!isOpen) return+ setInitialLoading(true)+ programAPI.get(programId)+ .then(p => {+ const map: Record<number, types.Exercise> = {}+ ;(p.exercises || []).forEach(ex => { map[ex.exercise_id] = ex.exercise })+ setPickerExercises(map)+ setFormData({+ name: p.name,+ notes: p.notes || '',+ exercises: (p.exercises || []).map(ex => ({+ exercise_id: ex.exercise_id,+ notes: ex.notes || '',+ sets: (ex.sets || []).map(s => ({+ set_number: s.set_number,+ target_reps: s.target_reps,+ target_weight: s.target_weight,+ })),+ })),+ })+ })+ .catch(() => setError('Failed to load program'))+ .finally(() => setInitialLoading(false))+ }, [isOpen, programId])++ const addExercise = (exercise: types.Exercise) => {+ setPickerExercises(prev => ({ ...prev, [exercise.id]: exercise }))+ setFormData(prev => ({+ ...prev,+ exercises: [...prev.exercises, { exercise_id: exercise.id, notes: '', sets: [{ set_number: 1, target_reps: 0, target_weight: 0 }] }],+ }))+ setShowPicker(false)+ setError('')+ }++ const removeExercise = (index: number) => {+ setFormData(prev => ({ ...prev, exercises: prev.exercises.filter((_, i) => i !== index) }))+ }++ const addSet = (exIdx: number) => {+ setFormData(prev => {+ const exercises = [...prev.exercises]+ exercises[exIdx].sets.push({ set_number: exercises[exIdx].sets.length + 1, target_reps: 0, target_weight: 0 })+ return { ...prev, exercises }+ })+ }++ const removeSet = (exIdx: number, setIdx: number) => {+ setFormData(prev => {+ const exercises = [...prev.exercises]+ exercises[exIdx].sets = exercises[exIdx].sets.filter((_, i) => i !== setIdx)+ return { ...prev, exercises }+ })+ }++ const updateSet = (exIdx: number, setIdx: number, field: string, value: any) => {+ setFormData(prev => {+ const exercises = [...prev.exercises]+ ;(exercises[exIdx].sets[setIdx] as any)[field] = Number(value) || 0+ return { ...prev, exercises }+ })+ }++ const handleSubmit = async (e: React.FormEvent) => {+ e.preventDefault()+ if (!formData.name.trim()) { setError('Program name required'); return }+ if (formData.exercises.length === 0) { setError('Add at least one exercise'); return }++ setLoading(true)+ try {+ await programAPI.update(programId, formData)+ onSuccess()+ onClose()+ } catch (err: any) {+ setError(err.response?.data?.error || 'Failed to update program')+ } finally {+ setLoading(false)+ }+ }++ if (!isOpen) return null++ if (initialLoading) {+ return createPortal(+ <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">+ <div className="bg-surface-base border border-surface-border rounded-2xl w-full max-h-[90vh] sm:max-w-2xl overflow-y-auto">+ <div className="sticky top-0 border-b border-surface-border bg-surface-base px-5 py-4 flex items-center justify-between">+ <h2 className="font-display font-bold text-xl text-tx-primary">Edit Program</h2>+ <button onClick={onClose} className="p-1 hover:bg-surface-muted rounded-lg transition-colors">+ <X className="w-5 h-5 text-tx-muted" />+ </button>+ </div>+ <div className="p-5 flex items-center justify-center h-32">+ <BookOpen className="w-6 h-6 text-brand-500 animate-pulse" />+ </div>+ </div>+ </div>+ , document.body)+ }++ const selectedIds = formData.exercises.map(e => e.exercise_id)+ const totalSets = formData.exercises.reduce((sum, ex) => sum + ex.sets.length, 0)++ return createPortal(+ <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">+ <div className="bg-surface-base border border-surface-border rounded-2xl w-full max-h-[90vh] sm:max-w-2xl overflow-y-auto">+ <div className="sticky top-0 border-b border-surface-border bg-surface-base px-5 py-4 flex items-center justify-between">+ <div>+ <h2 className="font-display font-bold text-xl text-tx-primary">Edit Program</h2>+ <p className="text-xs text-tx-muted mt-1">{formData.exercises.length} exercises • {totalSets} sets</p>+ </div>+ <button onClick={onClose} className="p-1 hover:bg-surface-muted rounded-lg transition-colors">+ <X className="w-5 h-5 text-tx-muted" />+ </button>+ </div>++ <form onSubmit={handleSubmit} className="p-5 space-y-6">+ {error && (+ <div className="alert-error">+ <AlertCircle className="w-4 h-4 flex-shrink-0" />+ <span>{error}</span>+ </div>+ )}++ <div>+ <div className="flex items-center gap-2 mb-2">+ <BookOpen className="w-4 h-4 text-brand-500" />+ <label className="label">Program Name</label>+ </div>+ <input+ type="text"+ value={formData.name}+ onChange={e => setFormData(prev => ({ ...prev, name: e.target.value }))}+ className="input mt-1"+ />+ </div>++ <div>+ <div className="flex items-center gap-2 mb-2">+ <FileText className="w-4 h-4 text-brand-500" />+ <label className="label">Notes</label>+ </div>+ <textarea+ value={formData.notes}+ onChange={e => setFormData(prev => ({ ...prev, notes: e.target.value }))}+ className="input mt-1 min-h-16 resize-none"+ />+ </div>++ {formData.exercises.length > 0 && (+ <div className="grid grid-cols-2 gap-2 p-3 bg-brand-500/10 border border-brand-500/20 rounded-lg">+ <div className="text-center">+ <Zap className="w-3.5 h-3.5 text-brand-500 mx-auto mb-1" />+ <div className="text-sm font-bold text-brand-500">{formData.exercises.length}</div>+ <div className="text-xs text-tx-muted">Exercises</div>+ </div>+ <div className="text-center">+ <Target className="w-3.5 h-3.5 text-brand-500 mx-auto mb-1" />+ <div className="text-sm font-bold text-brand-500">{totalSets}</div>+ <div className="text-xs text-tx-muted">Target Sets</div>+ </div>+ </div>+ )}++ <div>+ <div className="flex items-center justify-between mb-3">+ <div className="flex items-center gap-2">+ <Zap className="w-4 h-4 text-brand-500" />+ <label className="label">Exercises</label>+ </div>+ <button+ type="button"+ onClick={() => setShowPicker(true)}+ className="flex items-center gap-1.5 px-3 py-1.5 text-xs bg-brand-500 hover:bg-brand-600 text-white rounded-lg transition-colors font-medium"+ >+ <Plus className="w-3.5 h-3.5" />+ Add Exercise+ </button>+ </div>++ {showPicker && (+ <ExercisePicker selectedIds={selectedIds} onSelect={addExercise} onClose={() => setShowPicker(false)} />+ )}++ <div className="space-y-4">+ {formData.exercises.map((workoutEx, exIdx) => {+ const exercise = pickerExercises[workoutEx.exercise_id]+ return (+ <div key={exIdx} className="p-4 bg-surface-muted/30 border border-surface-border rounded-lg">+ <div className="flex items-start justify-between mb-4">+ <div className="flex-1">+ <div className="flex items-center gap-2 mb-1">+ <div className="w-6 h-6 rounded bg-brand-500/20 flex items-center justify-center flex-shrink-0">+ <span className="text-xs font-bold text-brand-500">{exIdx + 1}</span>+ </div>+ <p className="font-semibold text-tx-primary">{exercise?.name}</p>+ </div>+ <p className="text-xs text-tx-muted ml-8">{exercise?.muscle_group} • {exercise?.equipment}</p>+ </div>+ <button type="button" onClick={() => removeExercise(exIdx)} className="p-1.5 hover:bg-error-500/20 rounded transition-colors flex-shrink-0">+ <Trash2 className="w-4 h-4 text-error-400" />+ </button>+ </div>++ <div className="mb-4">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">Notes</label>+ <input+ type="text"+ value={workoutEx.notes}+ onChange={e => {+ const exercises = [...formData.exercises]+ exercises[exIdx].notes = e.target.value+ setFormData(prev => ({ ...prev, exercises }))+ }}+ className="input text-sm"+ />+ </div>++ <div className="space-y-2 mb-3">+ <div className="flex items-center justify-between">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider">Target Sets</label>+ <span className="text-xs text-tx-muted">{workoutEx.sets.length} sets</span>+ </div>+ {workoutEx.sets.map((set, setIdx) => (+ <div key={setIdx} className="flex gap-2 items-end bg-surface-raised/40 p-3 rounded-lg border border-surface-border/50">+ <div className="flex-shrink-0 w-12">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block">Set</label>+ <div className="text-sm font-bold text-tx-primary bg-surface-muted px-2 py-1 rounded text-center">{set.set_number}</div>+ </div>+ <div className="flex-1 min-w-0">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">Target Reps</label>+ <input type="number" inputMode="numeric" value={set.target_reps || ''} onChange={e => updateSet(exIdx, setIdx, 'target_reps', e.target.value)} placeholder="10" className="input text-sm w-full" min="0" />+ </div>+ <div className="flex-1 min-w-0">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">Target Weight</label>+ <div className="relative">+ <input type="number" inputMode="decimal" value={set.target_weight || ''} onChange={e => updateSet(exIdx, setIdx, 'target_weight', e.target.value)} placeholder="135" className="input text-sm w-full pr-7" min="0" step="0.5" />+ <span className="absolute right-2 top-1/2 -translate-y-1/2 text-xs text-tx-muted font-medium pointer-events-none">lbs</span>+ </div>+ </div>+ <button type="button" onClick={() => removeSet(exIdx, setIdx)} className="p-2 hover:bg-error-500/20 rounded transition-colors flex-shrink-0">+ <Trash2 className="w-4 h-4 text-error-400" />+ </button>+ </div>+ ))}+ </div>++ <button type="button" onClick={() => addSet(exIdx)} className="flex items-center gap-1 text-xs text-brand-400 hover:text-brand-300 font-medium transition-colors">+ <Plus className="w-3.5 h-3.5" />+ Add Set+ </button>+ </div>+ )+ })}+ </div>+ </div>++ <div className="flex gap-3 sticky bottom-0 bg-surface-base pt-4 border-t border-surface-border -mx-5 px-5 pb-5">+ <button type="button" onClick={onClose} className="flex-1 px-4 py-3 bg-surface-muted hover:bg-surface-muted/80 text-tx-secondary rounded-lg transition-colors font-medium">+ Cancel+ </button>+ <button type="submit" disabled={loading} className="flex-1 px-4 py-3 bg-brand-500 hover:bg-brand-600 disabled:opacity-40 disabled:cursor-not-allowed text-white font-medium rounded-lg transition-colors flex items-center justify-center gap-2">+ <BookOpen className="w-4 h-4" />+ {loading ? 'Saving…' : 'Save Changes'}+ </button>+ </div>+ </form>+ </div>+ </div>+ , document.body)+}diff --git a/web/src/components/EditWorkoutModal.tsx b/web/src/components/EditWorkoutModal.tsxnew file mode 100644index 0000000..0b079be--- /dev/null+++ b/web/src/components/EditWorkoutModal.tsx@@ -0,0 +1,458 @@+import { useState, useEffect } from 'react'+import { createPortal } from 'react-dom'+import { Plus, X, Trash2, AlertCircle, Dumbbell, Clock, FileText, Zap, Target, Gauge } from 'lucide-react'+import { workoutAPI, exerciseAPI } from '../services/api'+import ExercisePicker from './ExercisePicker'+import * as types from '../types'++interface WorkoutFormData {+ name: string+ notes: string+ duration: number+ exercises: {+ exercise_id: number+ notes: string+ sets: {+ set_number: number+ reps: number+ weight: number+ }[]+ }[]+}++interface Props {+ isOpen: boolean+ onClose: () => void+ onSuccess: () => void+ workoutId: number+}++export default function EditWorkoutModal({ isOpen, onClose, onSuccess, workoutId }: Props) {+ const [pickerExercises, setPickerExercises] = useState<Record<number, types.Exercise>>({})+ const [showPicker, setShowPicker] = useState(false)+ const [loading, setLoading] = useState(false)+ const [error, setError] = useState('')+ const [initialLoading, setInitialLoading] = useState(false)++ const [formData, setFormData] = useState<WorkoutFormData>({+ name: '',+ notes: '',+ duration: 0,+ exercises: [],+ })++ useEffect(() => {+ if (!isOpen) return+ loadWorkoutData()+ }, [isOpen, workoutId])++ const loadWorkoutData = async () => {+ setInitialLoading(true)+ try {+ const workout = await workoutAPI.get(workoutId)+ const exerciseMap: Record<number, types.Exercise> = {}+ ;(workout.exercises || []).forEach(ex => {+ exerciseMap[ex.exercise_id] = ex.exercise+ })+ setPickerExercises(exerciseMap)++ setFormData({+ name: workout.name,+ notes: workout.notes || '',+ duration: workout.duration,+ exercises: (workout.exercises || []).map(ex => ({+ exercise_id: ex.exercise_id,+ notes: ex.notes || '',+ sets: (ex.sets || []).map(s => ({+ set_number: s.set_number,+ reps: s.reps,+ weight: s.weight,+ })),+ })),+ })+ } catch (err) {+ console.error('Failed to load workout:', err)+ setError('Failed to load workout')+ } finally {+ setInitialLoading(false)+ }+ }++ const addExercise = (exercise: types.Exercise) => {+ setPickerExercises(prev => ({ ...prev, [exercise.id]: exercise }))+ setFormData({+ ...formData,+ exercises: [+ ...formData.exercises,+ {+ exercise_id: exercise.id,+ notes: '',+ sets: [{ set_number: 1, reps: 0, weight: 0 }],+ },+ ],+ })+ setShowPicker(false)+ setError('')+ }++ const removeExercise = (index: number) => {+ setFormData({+ ...formData,+ exercises: formData.exercises.filter((_, i) => i !== index),+ })+ }++ const addSet = (exerciseIndex: number) => {+ const newExercises = [...formData.exercises]+ const setCount = newExercises[exerciseIndex].sets.length + 1+ newExercises[exerciseIndex].sets.push({+ set_number: setCount,+ reps: 0,+ weight: 0,+ })+ setFormData({ ...formData, exercises: newExercises })+ }++ const removeSet = (exerciseIndex: number, setIndex: number) => {+ const newExercises = [...formData.exercises]+ newExercises[exerciseIndex].sets = newExercises[exerciseIndex].sets.filter((_, i) => i !== setIndex)+ setFormData({ ...formData, exercises: newExercises })+ }++ const updateSet = (exerciseIndex: number, setIndex: number, field: string, value: any) => {+ const newExercises = [...formData.exercises]+ ;(newExercises[exerciseIndex].sets[setIndex] as any)[field] = field === 'reps' || field === 'weight' ? Number(value) || 0 : value+ setFormData({ ...formData, exercises: newExercises })+ }++ const handleSubmit = async (e: React.FormEvent) => {+ e.preventDefault()+ if (!formData.name.trim()) {+ setError('Workout name required')+ return+ }+ if (formData.exercises.length === 0) {+ setError('Add at least one exercise')+ return+ }++ setLoading(true)+ try {+ await workoutAPI.update(workoutId, {+ name: formData.name,+ notes: formData.notes,+ duration: formData.duration,+ exercises: formData.exercises,+ started_at: new Date().toISOString(),+ })+ onSuccess()+ onClose()+ } catch (err: any) {+ setError(err.response?.data?.error || 'Failed to update workout')+ } finally {+ setLoading(false)+ }+ }++ if (!isOpen) return null++ const selectedExerciseIds = formData.exercises.map(e => e.exercise_id)+ const totalSets = formData.exercises.reduce((sum, ex) => sum + ex.sets.length, 0)+ const totalWeight = formData.exercises.reduce((sum, ex) => sum + ex.sets.reduce((s, set) => s + (set.weight || 0), 0), 0)++ if (initialLoading) {+ return createPortal((+ <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">+ <div className="bg-surface-base border border-surface-border rounded-2xl w-full max-h-[90vh] sm:max-w-2xl overflow-y-auto">+ <div className="sticky top-0 border-b border-surface-border bg-surface-base px-5 py-4 flex items-center justify-between">+ <h2 className="font-display font-bold text-xl text-tx-primary">Edit Workout</h2>+ <button onClick={onClose} className="p-1 hover:bg-surface-muted rounded-lg transition-colors">+ <X className="w-5 h-5 text-tx-muted" />+ </button>+ </div>+ <div className="p-5 flex items-center justify-center h-32">+ <div className="animate-spin">+ <Dumbbell className="w-6 h-6 text-brand-500" />+ </div>+ </div>+ </div>+ </div>+ ), document.body)+ }++ return createPortal((+ <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">+ <div className="bg-surface-base border border-surface-border rounded-2xl w-full max-h-[90vh] sm:max-w-2xl overflow-y-auto">+ {/* Header */}+ <div className="sticky top-0 border-b border-surface-border bg-surface-base px-5 py-4 flex items-center justify-between">+ <div>+ <h2 className="font-display font-bold text-xl text-tx-primary">Edit Workout</h2>+ <p className="text-xs text-tx-muted mt-1">{formData.exercises.length} exercises • {totalSets} sets</p>+ </div>+ <button onClick={onClose} className="p-1 hover:bg-surface-muted rounded-lg transition-colors">+ <X className="w-5 h-5 text-tx-muted" />+ </button>+ </div>++ {/* Content */}+ <form onSubmit={handleSubmit} className="p-5 space-y-6">+ {error && (+ <div className="alert-error">+ <AlertCircle className="w-4 h-4 flex-shrink-0" />+ <span>{error}</span>+ </div>+ )}++ {/* Workout name */}+ <div>+ <div className="flex items-center gap-2 mb-2">+ <Dumbbell className="w-4 h-4 text-brand-500" />+ <label className="label">Workout Name</label>+ <span className="text-xs text-tx-muted">(required)</span>+ </div>+ <input+ type="text"+ value={formData.name}+ onChange={e => setFormData({ ...formData, name: e.target.value })}+ placeholder="e.g., Leg Day, Push Day, Cardio Session"+ className="input mt-1"+ />+ </div>++ {/* Duration */}+ <div>+ <div className="flex items-center gap-2 mb-2">+ <Clock className="w-4 h-4 text-brand-500" />+ <label className="label">Duration</label>+ </div>+ <div className="grid grid-cols-2 gap-3">+ <div>+ <label className="text-xs text-tx-muted font-medium block mb-1">Minutes</label>+ <input+ type="number"+ value={formData.duration || ''}+ onChange={e => setFormData({ ...formData, duration: Number(e.target.value) || 0 })}+ placeholder="0"+ className="input w-full"+ min="0"+ />+ </div>+ <div className="flex items-end">+ <div className="text-sm text-tx-muted py-2 px-3 bg-surface-muted/30 rounded-lg w-full text-center font-medium">+ {Math.floor(formData.duration / 60)}h {formData.duration % 60}m+ </div>+ </div>+ </div>+ </div>++ {/* Notes */}+ <div>+ <div className="flex items-center gap-2 mb-2">+ <FileText className="w-4 h-4 text-brand-500" />+ <label className="label">Notes</label>+ </div>+ <textarea+ value={formData.notes}+ onChange={e => setFormData({ ...formData, notes: e.target.value })}+ placeholder="How did it feel? Any PRs? Energy level?"+ className="input mt-1 min-h-20 resize-none"+ />+ </div>++ {/* Workout Summary */}+ {formData.exercises.length > 0 && (+ <div className="grid grid-cols-3 gap-2 p-3 bg-brand-500/10 border border-brand-500/20 rounded-lg">+ <div className="text-center">+ <div className="flex items-center justify-center gap-1 mb-1">+ <Zap className="w-3.5 h-3.5 text-brand-500" />+ </div>+ <div className="text-sm font-bold text-brand-500">{formData.exercises.length}</div>+ <div className="text-xs text-tx-muted">Exercises</div>+ </div>+ <div className="text-center">+ <div className="flex items-center justify-center gap-1 mb-1">+ <Target className="w-3.5 h-3.5 text-brand-500" />+ </div>+ <div className="text-sm font-bold text-brand-500">{totalSets}</div>+ <div className="text-xs text-tx-muted">Sets</div>+ </div>+ <div className="text-center">+ <div className="flex items-center justify-center gap-1 mb-1">+ <Gauge className="w-3.5 h-3.5 text-brand-500" />+ </div>+ <div className="text-sm font-bold text-brand-500">{Math.round(totalWeight)}</div>+ <div className="text-xs text-tx-muted">Total lbs</div>+ </div>+ </div>+ )}++ {/* Exercises */}+ <div>+ <div className="flex items-center justify-between mb-3">+ <div className="flex items-center gap-2">+ <Zap className="w-4 h-4 text-brand-500" />+ <label className="label">Exercises</label>+ <span className="text-xs text-tx-muted">(required)</span>+ </div>+ <button+ type="button"+ onClick={() => setShowPicker(true)}+ className="flex items-center gap-1.5 px-3 py-1.5 text-xs bg-brand-500 hover:bg-brand-600 text-white rounded-lg transition-colors font-medium"+ >+ <Plus className="w-3.5 h-3.5" />+ Add Exercise+ </button>+ </div>++ {showPicker && (+ <ExercisePicker+ selectedIds={selectedExerciseIds}+ onSelect={addExercise}+ onClose={() => setShowPicker(false)}+ />+ )}++ {/* Selected exercises */}+ <div className="space-y-4">+ {formData.exercises.map((workoutEx, exIdx) => {+ const exercise = pickerExercises[workoutEx.exercise_id]+ return (+ <div key={exIdx} className="p-4 bg-surface-muted/30 border border-surface-border rounded-lg">+ {/* Exercise header */}+ <div className="flex items-start justify-between mb-4">+ <div className="flex-1">+ <div className="flex items-center gap-2 mb-1">+ <div className="w-6 h-6 rounded bg-brand-500/20 flex items-center justify-center flex-shrink-0">+ <span className="text-xs font-bold text-brand-500">{exIdx + 1}</span>+ </div>+ <p className="font-semibold text-tx-primary">{exercise?.name}</p>+ </div>+ <p className="text-xs text-tx-muted ml-8">{exercise?.muscle_group} • {exercise?.equipment}</p>+ </div>+ <button+ type="button"+ onClick={() => removeExercise(exIdx)}+ className="p-1.5 hover:bg-error-500/20 rounded transition-colors flex-shrink-0"+ title="Remove exercise"+ >+ <Trash2 className="w-4 h-4 text-error-400" />+ </button>+ </div>++ {/* Exercise notes */}+ <div className="mb-4">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">Notes</label>+ <input+ type="text"+ value={workoutEx.notes}+ onChange={e => {+ const newExercises = [...formData.exercises]+ newExercises[exIdx].notes = e.target.value+ setFormData({ ...formData, exercises: newExercises })+ }}+ placeholder="e.g., Felt strong, good form"+ className="input text-sm"+ />+ </div>++ {/* Sets */}+ <div className="space-y-2 mb-3">+ <div className="flex items-center justify-between">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider">Sets</label>+ <span className="text-xs text-tx-muted">{workoutEx.sets.length} sets</span>+ </div>+ {workoutEx.sets.map((set, setIdx) => (+ <div key={setIdx} className="flex gap-2 items-end bg-surface-raised/40 p-3 rounded-lg border border-surface-border/50">+ {/* Set number */}+ <div className="flex-shrink-0 w-12">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block">Set</label>+ <div className="text-sm font-bold text-tx-primary bg-surface-muted px-2 py-1 rounded text-center">+ {set.set_number}+ </div>+ </div>++ {/* Reps */}+ <div className="flex-1 min-w-0">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">Reps</label>+ <input+ type="number"+ inputMode="numeric"+ value={set.reps || ''}+ onChange={e => updateSet(exIdx, setIdx, 'reps', e.target.value)}+ placeholder="10"+ className="input text-sm w-full"+ min="0"+ />+ </div>++ {/* Weight */}+ <div className="flex-1 min-w-0">+ <label className="text-xs text-tx-muted font-medium uppercase tracking-wider block mb-1">Weight</label>+ <div className="relative">+ <input+ type="number"+ inputMode="decimal"+ value={set.weight || ''}+ onChange={e => updateSet(exIdx, setIdx, 'weight', e.target.value)}+ placeholder="225"+ className="input text-sm w-full pr-7"+ min="0"+ step="0.5"+ />+ <span className="absolute right-2 top-1/2 -translate-y-1/2 text-xs text-tx-muted font-medium pointer-events-none">+ lbs+ </span>+ </div>+ </div>++ {/* Remove set button */}+ <button+ type="button"+ onClick={() => removeSet(exIdx, setIdx)}+ className="p-2 hover:bg-error-500/20 rounded transition-colors flex-shrink-0"+ title="Remove set"+ >+ <Trash2 className="w-4 h-4 text-error-400" />+ </button>+ </div>+ ))}+ </div>++ {/* Add set button */}+ <button+ type="button"+ onClick={() => addSet(exIdx)}+ className="flex items-center gap-1 text-xs text-brand-400 hover:text-brand-300 font-medium transition-colors"+ >+ <Plus className="w-3.5 h-3.5" />+ Add Set+ </button>+ </div>+ )+ })}+ </div>+ </div>++ {/* Submit buttons */}+ <div className="flex gap-3 sticky bottom-0 bg-surface-base pt-4 border-t border-surface-border -mx-5 px-5 pb-5">+ <button+ type="button"+ onClick={onClose}+ className="flex-1 px-4 py-3 bg-surface-muted hover:bg-surface-muted/80 text-tx-secondary rounded-lg transition-colors font-medium"+ >+ Cancel+ </button>+ <button+ type="submit"+ disabled={loading}+ className="flex-1 px-4 py-3 bg-brand-500 hover:bg-brand-600 disabled:opacity-40 disabled:cursor-not-allowed text-white font-medium rounded-lg transition-colors flex items-center justify-center gap-2"+ >+ <Dumbbell className="w-4 h-4" />+ {loading ? 'Saving…' : 'Save Changes'}+ </button>+ </div>+ </form>+ </div>+ </div>+ ), document.body)+}diff --git a/web/src/components/ExercisePicker.tsx b/web/src/components/ExercisePicker.tsxnew file mode 100644index 0000000..498efdf--- /dev/null+++ b/web/src/components/ExercisePicker.tsx@@ -0,0 +1,156 @@+import { useState, useEffect } from 'react'+import { X, Search, Dumbbell, ChevronRight } from 'lucide-react'+import { exerciseAPI } from '../services/api'+import * as types from '../types'++const MUSCLE_COLORS: Record<string, string> = {+ chest: 'bg-red-500/20 text-red-400 border-red-500/30',+ back: 'bg-blue-500/20 text-blue-400 border-blue-500/30',+ shoulders: 'bg-orange-500/20 text-orange-400 border-orange-500/30',+ biceps: 'bg-purple-500/20 text-purple-400 border-purple-500/30',+ triceps: 'bg-pink-500/20 text-pink-400 border-pink-500/30',+ legs: 'bg-green-500/20 text-green-400 border-green-500/30',+ quadriceps: 'bg-green-500/20 text-green-400 border-green-500/30',+ hamstrings: 'bg-teal-500/20 text-teal-400 border-teal-500/30',+ glutes: 'bg-yellow-500/20 text-yellow-400 border-yellow-500/30',+ calves: 'bg-lime-500/20 text-lime-400 border-lime-500/30',+ abdominals: 'bg-amber-500/20 text-amber-400 border-amber-500/30',+ core: 'bg-amber-500/20 text-amber-400 border-amber-500/30',+ forearms: 'bg-cyan-500/20 text-cyan-400 border-cyan-500/30',+ traps: 'bg-indigo-500/20 text-indigo-400 border-indigo-500/30',+ lats: 'bg-sky-500/20 text-sky-400 border-sky-500/30',+}++const EQUIPMENT_LABEL: Record<string, string> = {+ 'body only': 'Bodyweight',+ 'barbell': 'Barbell',+ 'dumbbell': 'Dumbbell',+ 'machine': 'Machine',+ 'cable': 'Cable',+ 'kettlebells': 'Kettlebell',+ 'bands': 'Bands',+ 'medicine ball': 'Med Ball',+ 'other': 'Other',+ 'foam roll': 'Foam Roll',+}++function muscleColor(muscle: string) {+ const key = muscle?.toLowerCase()+ return MUSCLE_COLORS[key] || 'bg-surface-muted text-tx-muted border-surface-border'+}++interface Props {+ selectedIds: number[]+ onSelect: (exercise: types.Exercise) => void+ onClose: () => void+}++export default function ExercisePicker({ selectedIds, onSelect, onClose }: Props) {+ const [exercises, setExercises] = useState<types.Exercise[]>([])+ const [query, setQuery] = useState('')+ const [loading, setLoading] = useState(false)++ useEffect(() => {+ loadExercises('')+ }, [])++ useEffect(() => {+ const t = setTimeout(() => loadExercises(query), 250)+ return () => clearTimeout(t)+ }, [query])++ const loadExercises = async (q: string) => {+ setLoading(true)+ try {+ const data = await exerciseAPI.list(q ? { q } : undefined)+ setExercises(data || [])+ } catch {}+ finally { setLoading(false) }+ }++ const available = exercises.filter(e => !selectedIds.includes(e.id))++ return (+ <div className="fixed inset-0 bg-black/60 z-[60] flex items-center justify-center p-4">+ <div className="bg-surface-base border border-surface-border rounded-2xl w-full sm:max-w-lg flex flex-col max-h-[80vh]">+ {/* Header */}+ <div className="flex items-center justify-between px-4 py-3 border-b border-surface-border flex-shrink-0">+ <div>+ <h3 className="font-semibold text-tx-primary">Add Exercise</h3>+ <p className="text-xs text-tx-muted mt-0.5">{available.length} available</p>+ </div>+ <button onClick={onClose} className="p-1.5 hover:bg-surface-muted rounded-lg transition-colors">+ <X className="w-4 h-4 text-tx-muted" />+ </button>+ </div>++ {/* Search */}+ <div className="px-4 py-3 border-b border-surface-border flex-shrink-0">+ <div className="relative">+ <Search className="absolute left-3 top-1/2 -translate-y-1/2 w-4 h-4 text-tx-muted pointer-events-none" />+ <input+ type="text"+ value={query}+ onChange={e => setQuery(e.target.value)}+ placeholder="Search name, muscle, equipment…"+ className="input pl-10 w-full"+ autoFocus+ />+ </div>+ </div>++ {/* List */}+ <div className="overflow-y-auto flex-1">+ {loading && exercises.length === 0 ? (+ <div className="flex items-center justify-center p-8 text-tx-muted text-sm">+ <Dumbbell className="w-5 h-5 mr-2 animate-pulse text-brand-500" />+ Loading exercises…+ </div>+ ) : available.length === 0 ? (+ <div className="flex items-center justify-center p-8 text-tx-muted text-sm">+ No exercises found+ </div>+ ) : (+ <div className="divide-y divide-surface-border">+ {available.slice(0, 30).map(ex => (+ <button+ key={ex.id}+ type="button"+ onClick={() => onSelect(ex)}+ className="w-full flex items-center gap-3 px-4 py-3 hover:bg-surface-muted transition-colors text-left group"+ >+ {/* Icon */}+ <div className="w-9 h-9 rounded-lg bg-brand-500/10 border border-brand-500/20 flex items-center justify-center flex-shrink-0">+ <Dumbbell className="w-4 h-4 text-brand-500" />+ </div>++ {/* Info */}+ <div className="flex-1 min-w-0">+ <p className="text-sm font-medium text-tx-primary truncate">{ex.name}</p>+ <div className="flex items-center gap-1.5 mt-1 flex-wrap">+ <span className={`inline-flex items-center px-1.5 py-0.5 rounded text-xs font-medium border ${muscleColor(ex.muscle_group)}`}>+ {ex.muscle_group}+ </span>+ {ex.equipment && ex.equipment !== 'other' && (+ <span className="text-xs text-tx-muted">+ {EQUIPMENT_LABEL[ex.equipment] || ex.equipment}+ </span>+ )}+ </div>+ </div>++ <ChevronRight className="w-4 h-4 text-tx-muted flex-shrink-0 opacity-0 group-hover:opacity-100 transition-opacity" />+ </button>+ ))}+ {available.length > 30 && (+ <div className="px-4 py-2 text-xs text-tx-muted text-center">+ Showing 30 of {available.length} — refine search to narrow results+ </div>+ )}+ </div>+ )}+ </div>+ </div>+ </div>+ )+}diff --git a/web/src/components/Layout.tsx b/web/src/components/Layout.tsxindex 9e0648f..7623e3b 100644--- a/web/src/components/Layout.tsx+++ b/web/src/components/Layout.tsx@@ -1,29 +1,80 @@import { useState, useRef, useEffect } from 'react'-import { Outlet, Link, useLocation } from 'react-router-dom'+import { Outlet, Link, useLocation, useNavigate } from 'react-router-dom'import {- Home, Dumbbell, Apple, Scale, Settings,+ Home, Dumbbell, Apple, Scale, Settings, BookOpen,LogOut, Moon, Sun, User, ChevronDown,- Bell, Shield,+ Shield, Timer, ChevronRight,} from 'lucide-react'import { useAuthStore } from '../stores/auth'import { useTheme } from '../hooks/useTheme'+import { useWorkoutSession } from '../stores/workoutSession'import Logo from './Logo'const NAV = [- { path: '/', label: 'Home', icon: Home },- { path: '/workouts', label: 'Workouts', icon: Dumbbell },- { path: '/food', label: 'Food', icon: Apple },- { path: '/weight', label: 'Weight', icon: Scale },- { path: '/settings', label: 'Settings', icon: Settings },+ { path: '/', label: 'Home', icon: Home },+ { path: '/workouts', label: 'Workouts', icon: Dumbbell },+ { path: '/programs', label: 'Programs', icon: BookOpen },+ { path: '/food', label: 'Food', icon: Apple },+ { path: '/weight', label: 'Weight', icon: Scale },+ { path: '/settings', label: 'Settings', icon: Settings },]+function formatElapsed(seconds: number) {+ const h = Math.floor(seconds / 3600)+ const m = Math.floor((seconds % 3600) / 60)+ const s = seconds % 60+ if (h > 0) return `${h}:${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`+ return `${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`+}++function ActiveSessionBar() {+ const { session } = useWorkoutSession()+ const navigate = useNavigate()+ const { pathname } = useLocation()+ const [elapsed, setElapsed] = useState(0)++ useEffect(() => {+ if (!session) return+ const started = new Date(session.started_at).getTime()+ const tick = () => setElapsed(Math.floor((Date.now() - started) / 1000))+ tick()+ const id = setInterval(tick, 1000)+ return () => clearInterval(id)+ }, [session])++ if (!session || pathname === '/workout/active') return null++ const completedSets = session.exercises.reduce((s, ex) => s + ex.sets.filter(set => set.completed).length, 0)+ const totalSets = session.exercises.reduce((s, ex) => s + ex.sets.length, 0)++ return (+ <button+ onClick={() => navigate('/workout/active')}+ className="w-full flex items-center justify-between px-4 py-2.5 bg-brand-500 hover:bg-brand-600 transition-colors"+ >+ <div className="flex items-center gap-3">+ <div className="w-7 h-7 rounded-lg bg-white/15 flex items-center justify-center flex-shrink-0">+ <Timer className="w-3.5 h-3.5 text-white" />+ </div>+ <div className="text-left">+ <p className="text-xs font-bold text-white leading-tight truncate max-w-[160px]">{session.name}</p>+ <p className="text-xs text-white/70">{completedSets}/{totalSets} sets · {formatElapsed(elapsed)}</p>+ </div>+ </div>+ <div className="flex items-center gap-1.5">+ <span className="text-xs font-semibold text-white">Resume</span>+ <ChevronRight className="w-4 h-4 text-white/80" />+ </div>+ </button>+ )+}+function UserMenu() {const { user, logout } = useAuthStore()const { theme, toggleTheme } = useTheme()const [open, setOpen] = useState(false)const ref = useRef<HTMLDivElement>(null)- // Close on outside clickuseEffect(() => {const handler = (e: MouseEvent) => {if (ref.current && !ref.current.contains(e.target as Node)) setOpen(false)@@ -32,9 +83,7 @@ function UserMenu() {return () => document.removeEventListener('mousedown', handler)}, [])- const initials = user?.email- ? user.email.slice(0, 2).toUpperCase()- : 'U'+ const initials = user?.email ? user.email.slice(0, 2).toUpperCase() : 'U'return (<div ref={ref} className="relative">@@ -42,7 +91,6 @@ function UserMenu() {onClick={() => setOpen(o => !o)}className="flex items-center gap-2.5 px-3 py-2 rounded-lg hover:bg-surface-muted/60 active:bg-surface-muted transition-colors group">- {/* Avatar — larger, more prominent */}<div className="w-8 h-8 rounded-full bg-gradient-to-br from-brand-500 to-violet-500 flex items-center justify-center flex-shrink-0 ring-1 ring-brand-400/30"><span className="text-xs font-bold text-white leading-none">{initials}</span></div>@@ -52,32 +100,27 @@ function UserMenu() {<ChevronDown className={`w-3.5 h-3.5 text-tx-muted group-hover:text-tx-secondary transition-all duration-200 ${open ? 'rotate-180' : ''}`} /></button>- {/* Dropdown */}{open && (<div className="absolute right-0 top-full mt-1 w-64 bg-surface-overlay border border-surface-border rounded-2xl shadow-dropdown z-50 animate-slide-up overflow-hidden">- {/* User info header */}<div className="px-4 py-4 border-b border-surface-border/50 bg-surface-raised/40"><div className="flex items-center gap-3"><div className="w-12 h-12 rounded-full bg-gradient-to-br from-brand-500 to-violet-500 flex items-center justify-center flex-shrink-0 ring-2 ring-brand-400/30"><span className="text-sm font-bold text-white">{initials}</span></div><div className="min-w-0 flex-1">- <p className="text-sm font-semibold text-tx-primary truncate">- {user?.email?.split('@')[0]}- </p>+ <p className="text-sm font-semibold text-tx-primary truncate">{user?.email?.split('@')[0]}</p><p className="text-xs text-tx-muted truncate mt-0.5">{user?.email}</p></div></div></div>- {/* Menu items */}<div className="py-2"><Linkto="/settings"onClick={() => setOpen(false)}className="flex items-center gap-3 px-4 py-2.5 text-sm text-tx-secondary hover:text-tx-primary hover:bg-surface-muted/50 transition-colors">- <User className="w-4 h-4 text-tx-muted group-hover:text-brand-500" />+ <User className="w-4 h-4 text-tx-muted" /><span>Profile & Settings</span></Link><button@@ -85,19 +128,12 @@ function UserMenu() {className="w-full flex items-center gap-3 px-4 py-2.5 text-sm text-tx-secondary hover:text-tx-primary hover:bg-surface-muted/50 transition-colors">{theme === 'dark'- ? <>- <Sun className="w-4 h-4 text-tx-muted" />- <span>Switch to Light</span>- </>- : <>- <Moon className="w-4 h-4 text-tx-muted" />- <span>Switch to Dark</span>- </>+ ? <><Sun className="w-4 h-4 text-tx-muted" /><span>Switch to Light</span></>+ : <><Moon className="w-4 h-4 text-tx-muted" /><span>Switch to Dark</span></>}</button></div>- {/* Footer */}<div className="border-t border-surface-border/50 py-2"><div className="flex items-center gap-2 px-4 py-2"><Shield className="w-3.5 h-3.5 text-brand-500 flex-shrink-0" />@@ -122,7 +158,6 @@ export default function Layout() {return (<div className="min-h-screen flex flex-col bg-surface-base">- {/* Header */}<header className="sticky top-0 z-50 border-b border-surface-border bg-surface-base/95 backdrop-blur-sm"><div className="max-w-6xl mx-auto px-5 h-14 flex justify-between items-center"><Logo size="md" />@@ -130,25 +165,27 @@ export default function Layout() {</div></header>- {/* Content */}<main className="flex-1 max-w-6xl mx-auto w-full px-5 py-7 animate-fade-in"><Outlet /></main>- {/* Bottom nav */}- <nav className="sticky bottom-0 z-50 border-t border-surface-border bg-surface-base/95 backdrop-blur-sm">- <div className="max-w-6xl mx-auto px-5 flex">- {NAV.map(({ path, label, icon: Icon }) => {- const active = pathname === path- return (- <Link key={path} to={path} className={`nav-item flex-1 ${active ? 'active' : ''}`}>- <Icon className="w-5 h-5" strokeWidth={active ? 2.5 : 1.75} />- <span>{label}</span>- </Link>- )- })}- </div>- </nav>+ {/* Active session bar sits above bottom nav */}+ <div className="sticky bottom-0 z-50">+ <ActiveSessionBar />+ <nav className="border-t border-surface-border bg-surface-base/95 backdrop-blur-sm">+ <div className="max-w-6xl mx-auto px-5 flex">+ {NAV.map(({ path, label, icon: Icon }) => {+ const active = pathname === path+ return (+ <Link key={path} to={path} className={`nav-item flex-1 ${active ? 'active' : ''}`}>+ <Icon className="w-5 h-5" strokeWidth={active ? 2.5 : 1.75} />+ <span>{label}</span>+ </Link>+ )+ })}+ </div>+ </nav>+ </div></div>)}diff --git a/web/src/components/ProgramPicker.tsx b/web/src/components/ProgramPicker.tsxnew file mode 100644index 0000000..89575be--- /dev/null+++ b/web/src/components/ProgramPicker.tsx@@ -0,0 +1,86 @@+import { useState, useEffect } from 'react'+import { X, BookOpen, ChevronRight, Dumbbell, AlertCircle } from 'lucide-react'+import { programAPI } from '../services/api'+import * as types from '../types'++interface Props {+ onSelect: (program: types.Program) => void+ onClose: () => void+}++export default function ProgramPicker({ onSelect, onClose }: Props) {+ const [programs, setPrograms] = useState<types.Program[]>([])+ const [loading, setLoading] = useState(true)+ const [error, setError] = useState('')++ useEffect(() => {+ programAPI.list()+ .then(data => setPrograms(data || []))+ .catch(() => setError('Failed to load programs'))+ .finally(() => setLoading(false))+ }, [])++ return (+ <div className="fixed inset-0 bg-black/60 z-[60] flex items-center justify-center p-4">+ <div className="bg-surface-base border border-surface-border rounded-2xl w-full sm:max-w-lg flex flex-col max-h-[80vh]">+ <div className="flex items-center justify-between px-4 py-3 border-b border-surface-border flex-shrink-0">+ <div>+ <h3 className="font-semibold text-tx-primary">Load from Program</h3>+ <p className="text-xs text-tx-muted mt-0.5">Pick a program to pre-fill exercises</p>+ </div>+ <button onClick={onClose} className="p-1.5 hover:bg-surface-muted rounded-lg transition-colors">+ <X className="w-4 h-4 text-tx-muted" />+ </button>+ </div>++ <div className="overflow-y-auto flex-1">+ {loading ? (+ <div className="flex items-center justify-center p-8 text-tx-muted text-sm">+ <BookOpen className="w-5 h-5 mr-2 animate-pulse text-brand-500" />+ Loading programs…+ </div>+ ) : error ? (+ <div className="flex items-center gap-2 p-4 text-error-400 text-sm">+ <AlertCircle className="w-4 h-4 flex-shrink-0" />+ {error}+ </div>+ ) : programs.length === 0 ? (+ <div className="flex flex-col items-center justify-center p-8 text-center">+ <BookOpen className="w-8 h-8 text-tx-muted mb-2 opacity-50" />+ <p className="text-sm text-tx-muted">No programs yet</p>+ <p className="text-xs text-tx-muted mt-1">Create a program first</p>+ </div>+ ) : (+ <div className="divide-y divide-surface-border">+ {programs.map(p => (+ <button+ key={p.id}+ type="button"+ onClick={() => onSelect(p)}+ className="w-full flex items-center gap-3 px-4 py-3 hover:bg-surface-muted transition-colors text-left group"+ >+ <div className="w-9 h-9 rounded-lg bg-brand-500/10 border border-brand-500/20 flex items-center justify-center flex-shrink-0">+ <BookOpen className="w-4 h-4 text-brand-500" />+ </div>+ <div className="flex-1 min-w-0">+ <p className="text-sm font-medium text-tx-primary truncate">{p.name}</p>+ <div className="flex items-center gap-2 mt-0.5">+ <span className="text-xs text-tx-muted">+ <Dumbbell className="w-3 h-3 inline mr-1" />+ {p.exercises?.length || 0} exercises+ </span>+ {p.notes && (+ <span className="text-xs text-tx-muted truncate">• {p.notes}</span>+ )}+ </div>+ </div>+ <ChevronRight className="w-4 h-4 text-tx-muted flex-shrink-0 opacity-0 group-hover:opacity-100 transition-opacity" />+ </button>+ ))}+ </div>+ )}+ </div>+ </div>+ </div>+ )+}diff --git a/web/src/components/StartWorkoutModal.tsx b/web/src/components/StartWorkoutModal.tsxnew file mode 100644index 0000000..da7670f--- /dev/null+++ b/web/src/components/StartWorkoutModal.tsx@@ -0,0 +1,158 @@+import { useState, useEffect } from 'react'+import { createPortal } from 'react-dom'+import { X, Play, BookOpen, Zap, ChevronRight, Dumbbell, AlertCircle } from 'lucide-react'+import { useNavigate } from 'react-router-dom'+import { programAPI } from '../services/api'+import { useWorkoutSession } from '../stores/workoutSession'+import * as types from '../types'++type Mode = 'pick' | 'from-program'++interface Props {+ isOpen: boolean+ onClose: () => void+}++export default function StartWorkoutModal({ isOpen, onClose }: Props) {+ const navigate = useNavigate()+ const { startSession } = useWorkoutSession()+ const [mode, setMode] = useState<Mode>('pick')+ const [programs, setPrograms] = useState<types.Program[]>([])+ const [programsLoading, setProgramsLoading] = useState(false)+ const [programsError, setProgramsError] = useState('')++ useEffect(() => {+ if (!isOpen) setMode('pick')+ }, [isOpen])++ useEffect(() => {+ if (mode === 'from-program' && programs.length === 0) {+ setProgramsLoading(true)+ programAPI.list()+ .then(data => setPrograms(data || []))+ .catch(() => setProgramsError('Failed to load programs'))+ .finally(() => setProgramsLoading(false))+ }+ }, [mode])++ const startQuick = () => {+ const name = `Workout — ${new Date().toLocaleDateString('en-US', { month: 'short', day: 'numeric' })}`+ startSession(name, [])+ onClose()+ navigate('/workout/active')+ }++ const startFromProgram = (program: types.Program) => {+ const exercises: types.ActiveSessionExercise[] = (program.exercises || []).map(ex => ({+ exercise_id: ex.exercise_id,+ exercise: ex.exercise,+ notes: ex.notes || '',+ sets: (ex.sets || []).map(s => ({+ set_number: s.set_number,+ target_reps: s.target_reps,+ target_weight: s.target_weight,+ actual_reps: s.target_reps,+ actual_weight: s.target_weight,+ completed: false,+ })),+ }))+ startSession(program.name, exercises, program.id)+ onClose()+ navigate('/workout/active')+ }++ if (!isOpen) return null++ return createPortal((+ <div className="fixed inset-0 bg-black/50 z-50 flex items-center justify-center p-4">+ <div className="bg-surface-base border border-surface-border rounded-2xl w-full sm:max-w-md">+ <div className="flex items-center justify-between px-5 py-4 border-b border-surface-border">+ <h2 className="font-display font-bold text-xl text-tx-primary">Start Workout</h2>+ <button onClick={onClose} className="p-1 hover:bg-surface-muted rounded-lg transition-colors">+ <X className="w-5 h-5 text-tx-muted" />+ </button>+ </div>++ <div className="p-5">+ {mode === 'pick' && (+ <div className="space-y-3">+ <button+ onClick={startQuick}+ className="w-full flex items-center gap-4 p-4 bg-brand-500/10 border border-brand-500/20 hover:bg-brand-500/15 rounded-xl transition-colors group"+ >+ <div className="w-10 h-10 rounded-lg bg-brand-500 flex items-center justify-center flex-shrink-0">+ <Zap className="w-5 h-5 text-white" />+ </div>+ <div className="text-left flex-1">+ <p className="font-semibold text-tx-primary">Quick Start</p>+ <p className="text-xs text-tx-muted mt-0.5">Start blank, add exercises as you go</p>+ <p className="text-xs text-brand-400 mt-0.5 font-medium">Goes straight to session →</p>+ </div>+ <ChevronRight className="w-4 h-4 text-tx-muted opacity-0 group-hover:opacity-100 transition-opacity" />+ </button>++ <button+ onClick={() => setMode('from-program')}+ className="w-full flex items-center gap-4 p-4 bg-surface-muted/50 border border-surface-border hover:bg-surface-muted rounded-xl transition-colors group"+ >+ <div className="w-10 h-10 rounded-lg bg-surface-muted border border-surface-border flex items-center justify-center flex-shrink-0">+ <BookOpen className="w-5 h-5 text-brand-500" />+ </div>+ <div className="text-left flex-1">+ <p className="font-semibold text-tx-primary">From Program</p>+ <p className="text-xs text-tx-muted mt-0.5">Load a saved program template</p>+ </div>+ <ChevronRight className="w-4 h-4 text-tx-muted opacity-0 group-hover:opacity-100 transition-opacity" />+ </button>+ </div>+ )}++ {mode === 'from-program' && (+ <div className="space-y-3">+ <button onClick={() => setMode('pick')} className="text-xs text-tx-muted hover:text-tx-secondary transition-colors">← Back</button>+ {programsLoading ? (+ <div className="flex items-center justify-center py-8 text-tx-muted text-sm">+ <BookOpen className="w-5 h-5 mr-2 animate-pulse text-brand-500" />+ Loading programs…+ </div>+ ) : programsError ? (+ <div className="flex items-center gap-2 text-error-400 text-sm py-4">+ <AlertCircle className="w-4 h-4" />+ {programsError}+ </div>+ ) : programs.length === 0 ? (+ <div className="text-center py-8">+ <BookOpen className="w-8 h-8 text-tx-muted mx-auto mb-2 opacity-50" />+ <p className="text-sm text-tx-muted">No programs yet</p>+ <p className="text-xs text-tx-muted mt-1">Create a program first</p>+ </div>+ ) : (+ <div className="space-y-2 max-h-64 overflow-y-auto">+ {programs.map(p => (+ <button+ key={p.id}+ onClick={() => startFromProgram(p)}+ className="w-full flex items-center gap-3 p-3 bg-surface-muted/50 border border-surface-border hover:bg-surface-muted rounded-xl transition-colors text-left group"+ >+ <div className="w-9 h-9 rounded-lg bg-brand-500/10 border border-brand-500/20 flex items-center justify-center flex-shrink-0">+ <BookOpen className="w-4 h-4 text-brand-500" />+ </div>+ <div className="flex-1 min-w-0">+ <p className="text-sm font-semibold text-tx-primary truncate">{p.name}</p>+ <p className="text-xs text-tx-muted">+ <Dumbbell className="w-3 h-3 inline mr-1" />+ {p.exercises?.length || 0} exercises+ </p>+ </div>+ <Play className="w-4 h-4 text-brand-500 opacity-0 group-hover:opacity-100 transition-opacity flex-shrink-0" />+ </button>+ ))}+ </div>+ )}+ </div>+ )}+ </div>+ </div>+ </div>+ ), document.body)+}diff --git a/web/src/pages/ActiveWorkout.tsx b/web/src/pages/ActiveWorkout.tsxnew file mode 100644index 0000000..f309531--- /dev/null+++ b/web/src/pages/ActiveWorkout.tsx@@ -0,0 +1,325 @@+import { useState, useEffect } from 'react'+import { useNavigate } from 'react-router-dom'+import { Timer, CheckCircle2, Circle, Plus, Trash2, X, Dumbbell, Flag, AlertCircle } from 'lucide-react'+import { useWorkoutSession } from '../stores/workoutSession'+import { workoutAPI } from '../services/api'+import ExercisePicker from '../components/ExercisePicker'+import * as types from '../types'++const MUSCLE_COLORS: Record<string, string> = {+ chest: 'bg-red-500/15 text-red-400',+ back: 'bg-blue-500/15 text-blue-400',+ shoulders: 'bg-orange-500/15 text-orange-400',+ biceps: 'bg-purple-500/15 text-purple-400',+ triceps: 'bg-pink-500/15 text-pink-400',+ quadriceps: 'bg-green-500/15 text-green-400',+ hamstrings: 'bg-teal-500/15 text-teal-400',+ glutes: 'bg-yellow-500/15 text-yellow-400',+ calves: 'bg-lime-500/15 text-lime-400',+ abdominals: 'bg-amber-500/15 text-amber-400',+ forearms: 'bg-cyan-500/15 text-cyan-400',+ traps: 'bg-indigo-500/15 text-indigo-400',+ lats: 'bg-sky-500/15 text-sky-400',+}+function muscleColor(m: string) {+ return MUSCLE_COLORS[m?.toLowerCase()] || 'bg-surface-muted text-tx-muted'+}++function formatElapsed(seconds: number) {+ const h = Math.floor(seconds / 3600)+ const m = Math.floor((seconds % 3600) / 60)+ const s = seconds % 60+ if (h > 0) return `${h}:${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`+ return `${String(m).padStart(2, '0')}:${String(s).padStart(2, '0')}`+}++export default function ActiveWorkout() {+ const navigate = useNavigate()+ const { session, updateSet, completeSet, addSet, addExercise, removeExercise, buildPayload, cancelSession } = useWorkoutSession()+ const [elapsed, setElapsed] = useState(0)+ const [showPicker, setShowPicker] = useState(false)+ const [finishing, setFinishing] = useState(false)+ const [confirmCancel, setConfirmCancel] = useState(false)+ const [confirmFinish, setConfirmFinish] = useState(false)+ const [saveError, setSaveError] = useState('')+ const [saving, setSaving] = useState(false)++ useEffect(() => {+ if (!session) return+ const started = new Date(session.started_at).getTime()+ const tick = () => setElapsed(Math.floor((Date.now() - started) / 1000))+ tick()+ const id = setInterval(tick, 1000)+ return () => clearInterval(id)+ }, [session])++ if (!session) {+ return (+ <div className="empty-state py-20">+ <div className="w-12 h-12 rounded-xl bg-surface-muted border border-surface-border flex items-center justify-center mb-4">+ <Dumbbell className="w-6 h-6 text-tx-muted" />+ </div>+ <p className="text-sm font-medium text-tx-primary mb-1">No active workout</p>+ <p className="text-xs text-tx-muted mb-4">Start one from the home page</p>+ <button onClick={() => navigate('/')} className="btn-primary btn-sm">Go Home</button>+ </div>+ )+ }++ const handleAddExercise = (exercise: types.Exercise) => {+ const newEx: types.ActiveSessionExercise = {+ exercise_id: exercise.id,+ exercise,+ notes: '',+ sets: [{+ set_number: 1,+ target_reps: 0,+ target_weight: 0,+ actual_reps: 0,+ actual_weight: 0,+ completed: false,+ }],+ }+ addExercise(newEx)+ setShowPicker(false)+ }++ const handleFinish = async () => {+ setSaving(true)+ setSaveError('')+ try {+ const payload = buildPayload()+ await workoutAPI.create(payload)+ cancelSession()+ navigate('/workouts')+ } catch (err: any) {+ setSaveError(err.response?.data?.error || 'Failed to save workout')+ setSaving(false)+ setConfirmFinish(false)+ }+ }++ const selectedIds = session.exercises.map(e => e.exercise_id)+ const completedSets = session.exercises.reduce((sum, ex) => sum + ex.sets.filter(s => s.completed).length, 0)+ const totalSets = session.exercises.reduce((sum, ex) => sum + ex.sets.length, 0)++ return (+ <div className="space-y-4 animate-slide-up">+ {/* Header */}+ <div className="flex items-center justify-between">+ <div>+ <h1 className="font-display font-bold text-2xl text-tx-primary">{session.name}</h1>+ <div className="flex items-center gap-3 mt-0.5">+ <span className="flex items-center gap-1 text-sm font-mono text-brand-400">+ <Timer className="w-3.5 h-3.5" />+ {formatElapsed(elapsed)}+ </span>+ <span className="text-xs text-tx-muted">+ {completedSets}/{totalSets} sets done+ </span>+ </div>+ </div>+ <button+ onClick={() => setConfirmFinish(true)}+ disabled={finishing}+ className="flex items-center gap-2 px-4 py-2 bg-brand-500 hover:bg-brand-600 disabled:opacity-50 text-white font-semibold rounded-lg transition-colors text-sm"+ >+ <Flag className="w-4 h-4" />+ Finish+ </button>+ </div>++ <div>+ {saveError && (+ <div className="alert-error mb-4">+ <AlertCircle className="w-4 h-4 flex-shrink-0" />+ <span>{saveError}</span>+ </div>+ )}++ <div className="space-y-4">+ {session.exercises.length === 0 ? (+ <div className="empty-state py-16">+ <div className="w-12 h-12 rounded-xl bg-surface-muted border border-surface-border flex items-center justify-center mb-4">+ <Dumbbell className="w-6 h-6 text-tx-muted" />+ </div>+ <p className="text-sm font-medium text-tx-primary mb-1">No exercises yet</p>+ <p className="text-xs text-tx-muted">Add exercises below to get started</p>+ </div>+ ) : (+ session.exercises.map((ex, exIdx) => (+ <div key={exIdx} className="card overflow-hidden">+ {/* Exercise header */}+ <div className="flex items-center justify-between p-4 border-b border-surface-border">+ <div className="flex items-center gap-3 min-w-0">+ <div className="w-9 h-9 rounded-lg bg-brand-500/10 border border-brand-500/20 flex items-center justify-center flex-shrink-0">+ <Dumbbell className="w-4 h-4 text-brand-500" />+ </div>+ <div className="min-w-0">+ <p className="text-sm font-semibold text-tx-primary truncate">{ex.exercise.name}</p>+ <span className={`inline-flex items-center px-1.5 py-0.5 rounded text-xs font-medium mt-0.5 ${muscleColor(ex.exercise.muscle_group)}`}>+ {ex.exercise.muscle_group}+ </span>+ </div>+ </div>+ <button+ onClick={() => removeExercise(exIdx)}+ className="p-2 hover:bg-error-500/10 rounded-lg transition-colors flex-shrink-0 ml-2"+ >+ <X className="w-4 h-4 text-error-400" />+ </button>+ </div>++ {/* Sets */}+ <div className="p-3 space-y-2">+ {/* Column headers */}+ <div className="grid grid-cols-[2rem_1fr_1fr_2rem] gap-2 px-1">+ <span className="text-xs text-tx-muted font-medium text-center">Set</span>+ <span className="text-xs text-tx-muted font-medium text-center">Reps</span>+ <span className="text-xs text-tx-muted font-medium text-center">Weight</span>+ <span />+ </div>++ {ex.sets.map((set, setIdx) => (+ <div+ key={setIdx}+ className={`grid grid-cols-[2rem_1fr_1fr_2rem] gap-2 items-center p-2 rounded-lg border transition-colors ${+ set.completed+ ? 'bg-brand-500/5 border-brand-500/20'+ : 'bg-surface-muted/20 border-surface-border/50'+ }`}+ >+ <span className="text-xs font-bold text-tx-muted text-center">{set.set_number}</span>++ <input+ type="number"+ inputMode="numeric"+ value={set.actual_reps || ''}+ onChange={e => updateSet(exIdx, setIdx, 'actual_reps', Number(e.target.value) || 0)}+ placeholder={set.target_reps > 0 ? String(set.target_reps) : '0'}+ className={`input text-sm text-center px-2 py-1.5 ${set.completed ? 'opacity-60' : ''}`}+ disabled={set.completed}+ />++ <div className="relative">+ <input+ type="number"+ inputMode="decimal"+ value={set.actual_weight || ''}+ onChange={e => updateSet(exIdx, setIdx, 'actual_weight', Number(e.target.value) || 0)}+ placeholder={set.target_weight > 0 ? String(set.target_weight) : '0'}+ className={`input text-sm text-center px-2 py-1.5 w-full pr-6 ${set.completed ? 'opacity-60' : ''}`}+ disabled={set.completed}+ step="0.5"+ />+ <span className="absolute right-2 top-1/2 -translate-y-1/2 text-xs text-tx-muted pointer-events-none">lb</span>+ </div>++ <button+ onClick={() => completeSet(exIdx, setIdx)}+ className="flex items-center justify-center"+ >+ {set.completed+ ? <CheckCircle2 className="w-5 h-5 text-brand-500" />+ : <Circle className="w-5 h-5 text-tx-muted hover:text-brand-400 transition-colors" />+ }+ </button>+ </div>+ ))}++ <button+ onClick={() => addSet(exIdx)}+ className="flex items-center gap-1 text-xs text-brand-400 hover:text-brand-300 font-medium transition-colors mt-1 pl-1"+ >+ <Plus className="w-3.5 h-3.5" />+ Add Set+ </button>+ </div>+ </div>+ ))+ )}+ </div>++ {/* Add exercise + cancel */}+ <div className="mt-4 space-y-2 pb-4">+ <button+ onClick={() => setShowPicker(true)}+ className="w-full py-3 border border-dashed border-surface-border hover:border-brand-500/50 rounded-xl text-sm text-tx-muted hover:text-brand-400 transition-colors flex items-center justify-center gap-2"+ >+ <Plus className="w-4 h-4" />+ Add Exercise+ </button>++ <button+ onClick={() => setConfirmCancel(true)}+ className="w-full py-2.5 text-xs text-tx-muted hover:text-error-400 transition-colors"+ >+ Cancel Workout+ </button>+ </div>+ </div>++ {/* ExercisePicker */}+ {showPicker && (+ <ExercisePicker+ selectedIds={selectedIds}+ onSelect={handleAddExercise}+ onClose={() => setShowPicker(false)}+ />+ )}++ {/* Finish confirm */}+ {confirmFinish && (+ <div className="fixed inset-0 bg-black/60 z-50 flex items-center justify-center p-4">+ <div className="bg-surface-base border border-surface-border rounded-2xl w-full max-w-sm p-6">+ <h3 className="font-display font-bold text-lg text-tx-primary mb-1">Finish Workout?</h3>+ <p className="text-sm text-tx-muted mb-4">+ {completedSets} of {totalSets} sets completed. Workout will be saved.+ </p>+ <div className="flex gap-3">+ <button+ onClick={() => setConfirmFinish(false)}+ className="flex-1 py-2.5 bg-surface-muted hover:bg-surface-muted/80 text-tx-secondary rounded-lg transition-colors font-medium text-sm"+ >+ Keep Going+ </button>+ <button+ onClick={handleFinish}+ disabled={saving}+ className="flex-1 py-2.5 bg-brand-500 hover:bg-brand-600 disabled:opacity-50 text-white rounded-lg transition-colors font-semibold text-sm flex items-center justify-center gap-1.5"+ >+ <Flag className="w-3.5 h-3.5" />+ {saving ? 'Saving…' : 'Finish'}+ </button>+ </div>+ </div>+ </div>+ )}++ {/* Cancel confirm */}+ {confirmCancel && (+ <div className="fixed inset-0 bg-black/60 z-50 flex items-center justify-center p-4">+ <div className="bg-surface-base border border-surface-border rounded-2xl w-full max-w-sm p-6">+ <h3 className="font-display font-bold text-lg text-tx-primary mb-1">Cancel Workout?</h3>+ <p className="text-sm text-tx-muted mb-4">All progress will be lost. This cannot be undone.</p>+ <div className="flex gap-3">+ <button+ onClick={() => setConfirmCancel(false)}+ className="flex-1 py-2.5 bg-surface-muted hover:bg-surface-muted/80 text-tx-secondary rounded-lg transition-colors font-medium text-sm"+ >+ Keep Going+ </button>+ <button+ onClick={() => { cancelSession(); navigate('/') }}+ className="flex-1 py-2.5 bg-error-500 hover:bg-error-600 text-white rounded-lg transition-colors font-semibold text-sm flex items-center justify-center gap-1.5"+ >+ <Trash2 className="w-3.5 h-3.5" />+ Cancel+ </button>+ </div>+ </div>+ </div>+ )}+ </div>+ )+}diff --git a/web/src/pages/Dashboard.tsx b/web/src/pages/Dashboard.tsxindex 3f21ee4..983487b 100644--- a/web/src/pages/Dashboard.tsx+++ b/web/src/pages/Dashboard.tsx@@ -1,18 +1,23 @@import { useState, useEffect } from 'react'-import { format, subDays } from 'date-fns'+import { format } from 'date-fns'import {- TrendingDown, TrendingUp, Dumbbell, Utensils, Flame, Target, Plus, Activity,- Trophy, Scale, Apple, Timer, BarChart3, Beef, Zap, Award, ArrowRight,- CheckCircle2, AlertCircle,+ Dumbbell, Utensils, Flame, Plus,+ Apple, Beef, Zap, ArrowRight,+ CheckCircle2, AlertCircle, Play, Timer,} from 'lucide-react'-import { HelpTip } from '../components/Tooltip'import Loading from '../components/Loading'+import StartWorkoutModal from '../components/StartWorkoutModal'import { workoutAPI, foodAPI, weightAPI, userAPI } from '../services/api'+import { useWorkoutSession } from '../stores/workoutSession'+import { useNavigate, Link } from 'react-router-dom'import * as types from '../types'const TODAY = new Date()export default function Dashboard() {+ const navigate = useNavigate()+ const { session } = useWorkoutSession()+ const [showStartModal, setShowStartModal] = useState(false)const [stats, setStats] = useState<{weight?: types.WeightLog | nullweightStats?: types.WeightStats@@ -36,7 +41,7 @@ export default function Dashboard() {})),weightAPI.stats().catch(() => ({ latest: 0, starting: 0, total_entries: 0 })),userAPI.getSettings().catch(() => ({- user_id: 0, weight_unit: 'lbs', calorie_target: 2000,+ user_id: 0, weight_unit: 'lbs' as const, calorie_target: 2000,protein_target: 150, carb_target: 250, fat_target: 65})),])@@ -92,11 +97,33 @@ export default function Dashboard() {Your progress today</h1></div>- <button className="btn-primary btn-sm">- <Plus className="w-3.5 h-3.5" /> Log+ <button+ onClick={() => session ? navigate('/workout/active') : setShowStartModal(true)}+ className="btn-primary btn-sm"+ >+ <Play className="w-3.5 h-3.5" /> {session ? 'Resume' : 'Start Workout'}</button></div>+ {/* ── Active session banner ──────────────────── */}+ {session && (+ <Link+ to="/workout/active"+ className="flex items-center justify-between p-3 bg-amber-500/10 border border-amber-500/30 rounded-xl hover:bg-amber-500/15 transition-colors"+ >+ <div className="flex items-center gap-3">+ <div className="w-8 h-8 rounded-lg bg-amber-500/20 border border-amber-500/30 flex items-center justify-center flex-shrink-0">+ <Timer className="w-4 h-4 text-amber-400 animate-pulse" />+ </div>+ <div>+ <p className="text-sm font-semibold text-amber-300">Workout in progress</p>+ <p className="text-xs text-amber-400/70">{session.name} — tap to resume</p>+ </div>+ </div>+ <ArrowRight className="w-4 h-4 text-amber-400" />+ </Link>+ )}+{/* ── Top stat cards ─────────────────────────── */}<div className="grid grid-cols-2 lg:grid-cols-3 gap-3">{/* Calories */}@@ -247,6 +274,7 @@ export default function Dashboard() {</div>)}</div>+ <StartWorkoutModal isOpen={showStartModal} onClose={() => setShowStartModal(false)} /></div>)}diff --git a/web/src/pages/Food.tsx b/web/src/pages/Food.tsxindex 2e81948..6ed0eeb 100644--- a/web/src/pages/Food.tsx+++ b/web/src/pages/Food.tsx@@ -29,7 +29,7 @@ export default function Food() {total_calories: 0, total_protein: 0, total_carbs: 0, total_fat: 0, workout_count: 0})),userAPI.getSettings().catch(() => ({- user_id: 0, weight_unit: 'lbs', calorie_target: 2000,+ user_id: 0, weight_unit: 'lbs' as const, calorie_target: 2000,protein_target: 150, carb_target: 250, fat_target: 65})),])diff --git a/web/src/pages/Programs.tsx b/web/src/pages/Programs.tsxnew file mode 100644index 0000000..c6d0301--- /dev/null+++ b/web/src/pages/Programs.tsx@@ -0,0 +1,310 @@+import { useState, useEffect } from 'react'+import { format } from 'date-fns'+import { BookOpen, Plus, ChevronDown, Dumbbell, Target, Edit2, Trash2, AlertCircle, Search, Play } from 'lucide-react'+import { useNavigate } from 'react-router-dom'+import Loading from '../components/Loading'+import AddProgramModal from '../components/AddProgramModal'+import EditProgramModal from '../components/EditProgramModal'+import { programAPI } from '../services/api'+import { useWorkoutSession } from '../stores/workoutSession'+import * as types from '../types'++const MUSCLE_COLORS: Record<string, string> = {+ chest: 'bg-red-500/15 text-red-400',+ back: 'bg-blue-500/15 text-blue-400',+ shoulders: 'bg-orange-500/15 text-orange-400',+ biceps: 'bg-purple-500/15 text-purple-400',+ triceps: 'bg-pink-500/15 text-pink-400',+ quadriceps: 'bg-green-500/15 text-green-400',+ hamstrings: 'bg-teal-500/15 text-teal-400',+ glutes: 'bg-yellow-500/15 text-yellow-400',+ calves: 'bg-lime-500/15 text-lime-400',+ abdominals: 'bg-amber-500/15 text-amber-400',+ forearms: 'bg-cyan-500/15 text-cyan-400',+ traps: 'bg-indigo-500/15 text-indigo-400',+ lats: 'bg-sky-500/15 text-sky-400',+}+function muscleColor(m: string) {+ return MUSCLE_COLORS[m?.toLowerCase()] || 'bg-surface-muted text-tx-muted'+}++function ProgramCard({+ program,+ onEdit,+ onDelete,+}: {+ program: types.Program+ onEdit: (id: number) => void+ onDelete: (id: number) => void+}) {+ const navigate = useNavigate()+ const { session, startSession } = useWorkoutSession()+ const [open, setOpen] = useState(false)++ const handleStart = (e: React.MouseEvent) => {+ e.stopPropagation()+ if (session) { navigate('/workout/active'); return }+ const exercises: types.ActiveSessionExercise[] = (program.exercises || []).map(ex => ({+ exercise_id: ex.exercise_id,+ exercise: ex.exercise,+ notes: ex.notes || '',+ sets: (ex.sets || []).map(s => ({+ set_number: s.set_number,+ target_reps: s.target_reps,+ target_weight: s.target_weight,+ actual_reps: s.target_reps,+ actual_weight: s.target_weight,+ completed: false,+ })),+ }))+ startSession(program.name, exercises, program.id)+ navigate('/workout/active')+ }+ const [confirming, setConfirming] = useState(false)+ const [deleting, setDeleting] = useState(false)++ const handleDelete = async () => {+ setDeleting(true)+ try {+ await programAPI.delete(program.id)+ onDelete(program.id)+ } catch {+ setDeleting(false)+ setConfirming(false)+ }+ }++ if (confirming) {+ return (+ <div className="card overflow-hidden border-error-500/30">+ <div className="flex items-center justify-between p-4 bg-error-500/5">+ <div className="flex items-center gap-3">+ <div className="w-9 h-9 rounded-lg bg-error-500/10 border border-error-500/20 flex items-center justify-center flex-shrink-0">+ <Trash2 className="w-4 h-4 text-error-400" />+ </div>+ <div>+ <p className="text-sm font-semibold text-tx-primary">Delete "{program.name}"?</p>+ <p className="text-xs text-tx-muted">This cannot be undone</p>+ </div>+ </div>+ <div className="flex items-center gap-2">+ <button+ onClick={() => setConfirming(false)}+ className="px-3 py-1.5 text-xs bg-surface-muted hover:bg-surface-muted/80 text-tx-secondary rounded-lg transition-colors font-medium"+ >+ Cancel+ </button>+ <button+ onClick={handleDelete}+ disabled={deleting}+ className="px-3 py-1.5 text-xs bg-error-500 hover:bg-error-600 disabled:opacity-50 text-white rounded-lg transition-colors font-medium flex items-center gap-1"+ >+ <Trash2 className="w-3 h-3" />+ {deleting ? 'Deleting…' : 'Delete'}+ </button>+ </div>+ </div>+ </div>+ )+ }++ const totalSets = program.exercises?.reduce((s, e) => s + (e.sets?.length || 0), 0) || 0++ return (+ <div className="card overflow-hidden">+ <div className="flex items-center justify-between p-4 hover:bg-surface-muted transition-colors group">+ <button className="flex-1 flex items-center gap-3 min-w-0" onClick={() => setOpen(o => !o)}>+ <div className="w-9 h-9 rounded-lg bg-brand-500/10 border border-brand-500/20 flex items-center justify-center flex-shrink-0">+ <BookOpen className="w-4 h-4 text-brand-500" strokeWidth={2} />+ </div>+ <div className="text-left">+ <p className="text-sm font-semibold text-tx-primary">{program.name}</p>+ <p className="text-xs text-tx-muted">{format(new Date(program.created_at), 'MMM d, yyyy')}</p>+ </div>+ </button>+ <div className="flex items-center gap-2 sm:gap-4">+ <div className="hidden sm:flex items-center gap-4 text-xs text-tx-muted">+ <span className="flex items-center gap-1">+ <Dumbbell className="w-3.5 h-3.5" /> {program.exercises?.length || 0} exercises+ </span>+ <span className="flex items-center gap-1">+ <Target className="w-3.5 h-3.5" /> {totalSets} sets+ </span>+ </div>+ <button+ onClick={handleStart}+ className="p-2 bg-brand-500/10 hover:bg-brand-500/20 rounded-lg transition-colors border border-brand-500/20"+ title="Start workout from this program"+ >+ <Play className="w-4 h-4 text-brand-500" />+ </button>+ <button+ onClick={e => { e.stopPropagation(); onEdit(program.id) }}+ className="p-2 hover:bg-surface-muted rounded-lg transition-colors opacity-0 group-hover:opacity-100"+ >+ <Edit2 className="w-4 h-4 text-brand-500" />+ </button>+ <button+ onClick={e => { e.stopPropagation(); setConfirming(true) }}+ className="p-2 hover:bg-error-500/10 rounded-lg transition-colors opacity-0 group-hover:opacity-100"+ >+ <Trash2 className="w-4 h-4 text-error-400" />+ </button>+ <ChevronDown className={`w-4 h-4 text-tx-muted transition-transform duration-200 ${open ? 'rotate-180' : ''}`} />+ </div>+ </div>++ {open && (+ <div className="border-t border-surface-border animate-slide-up">+ {program.notes && (+ <p className="px-4 py-2.5 text-xs text-tx-muted border-b border-surface-border">{program.notes}</p>+ )}++ <div className="p-3 space-y-2">+ {program.exercises?.map((ex) => {+ const maxTarget = ex.sets?.length > 0 ? Math.max(...ex.sets.map(s => s.target_weight || 0)) : 0+ return (+ <div key={ex.id} className="bg-surface-muted/30 border border-surface-border rounded-xl p-3">+ <div className="flex items-start justify-between mb-2">+ <div className="flex items-start gap-2.5">+ <div className="w-8 h-8 rounded-lg bg-brand-500/10 border border-brand-500/20 flex items-center justify-center flex-shrink-0 mt-0.5">+ <Dumbbell className="w-3.5 h-3.5 text-brand-500" />+ </div>+ <div>+ <p className="text-sm font-semibold text-tx-primary leading-tight">{ex.exercise.name}</p>+ <span className={`inline-flex items-center px-1.5 py-0.5 rounded text-xs font-medium mt-1 ${muscleColor(ex.exercise.muscle_group)}`}>+ {ex.exercise.muscle_group}+ </span>+ </div>+ </div>+ <div className="text-right flex-shrink-0 ml-2">+ <p className="text-xs text-tx-muted">Target</p>+ <p className="text-sm font-bold text-brand-400 tabular-nums">{maxTarget > 0 ? `${maxTarget} lbs` : '—'}</p>+ </div>+ </div>++ <div className="flex flex-wrap gap-1.5 mt-2">+ {ex.sets?.map((set, i) => (+ <div key={i} className="flex items-center gap-1 bg-surface-raised px-2 py-1 rounded-lg border border-surface-border">+ <span className="text-xs text-tx-muted font-medium">#{set.set_number}</span>+ <span className="text-xs font-semibold text-tx-primary tabular-nums">+ {set.target_reps > 0 ? set.target_reps : '—'} × {set.target_weight > 0 ? `${set.target_weight}` : '0'}<span className="text-tx-muted font-normal">lb</span>+ </span>+ </div>+ ))}+ </div>+ </div>+ )+ })}+ </div>+ </div>+ )}+ </div>+ )+}++export default function Programs() {+ const [programs, setPrograms] = useState<types.Program[]>([])+ const [search, setSearch] = useState('')+ const [loading, setLoading] = useState(true)+ const [error, setError] = useState<string | null>(null)+ const [showAddModal, setShowAddModal] = useState(false)+ const [showEditModal, setShowEditModal] = useState(false)+ const [editingId, setEditingId] = useState<number | null>(null)++ const loadPrograms = async () => {+ try {+ const data = await programAPI.list()+ setPrograms(data || [])+ } catch (err: any) {+ setError(err.message || 'Failed to load programs')+ } finally {+ setLoading(false)+ }+ }++ useEffect(() => { loadPrograms() }, [])++ const filtered = programs.filter(p => p.name.toLowerCase().includes(search.toLowerCase()))++ if (loading) return <Loading />++ if (error) {+ return (+ <div className="alert-error">+ <AlertCircle className="w-5 h-5 flex-shrink-0" />+ <span>{error}</span>+ </div>+ )+ }++ return (+ <div className="space-y-5 animate-slide-up">+ <div className="flex justify-between items-center">+ <div>+ <h1 className="font-display font-bold text-2xl text-tx-primary">Programs</h1>+ <p className="text-tx-muted text-sm mt-0.5">Reusable workout templates</p>+ </div>+ <button onClick={() => setShowAddModal(true)} className="btn-primary btn-md">+ <Plus className="w-4 h-4" /> New Program+ </button>+ </div>++ <div className="grid grid-cols-2 gap-3">+ {[+ { label: 'Total', value: programs.length.toString(), unit: 'programs', icon: BookOpen },+ { label: 'Avg Exercises', value: programs.length > 0 ? Math.round(programs.reduce((s, p) => s + (p.exercises?.length || 0), 0) / programs.length).toString() : '0', unit: 'per program', icon: Dumbbell },+ ].map(s => (+ <div key={s.label} className="card p-4">+ <div className="flex items-center gap-1.5 mb-2">+ <span className="stat-label">{s.label}</span>+ </div>+ <div className="flex items-end gap-1.5">+ <span className="stat-value text-xl">{s.value}</span>+ <span className="text-xs text-tx-muted mb-0.5">{s.unit}</span>+ </div>+ </div>+ ))}+ </div>++ <div className="relative">+ <Search className="absolute left-3.5 top-1/2 -translate-y-1/2 w-4 h-4 text-tx-muted pointer-events-none" />+ <input+ value={search}+ onChange={e => setSearch(e.target.value)}+ className="input pl-10"+ placeholder="Search programs…"+ />+ </div>++ <div className="space-y-2">+ {filtered.length === 0 ? (+ <div className="empty-state">+ <div className="w-12 h-12 rounded-xl bg-surface-muted border border-surface-border flex items-center justify-center mb-4">+ <BookOpen className="w-6 h-6 text-tx-muted" />+ </div>+ <p className="text-sm font-medium text-tx-primary mb-1">No programs found</p>+ <p className="text-xs text-tx-muted">{search ? 'Try a different search' : 'Create a program to get started'}</p>+ </div>+ ) : (+ filtered.map(p => (+ <ProgramCard+ key={p.id}+ program={p}+ onEdit={(id) => { setEditingId(id); setShowEditModal(true) }}+ onDelete={(id) => setPrograms(prev => prev.filter(x => x.id !== id))}+ />+ ))+ )}+ </div>++ <AddProgramModal isOpen={showAddModal} onClose={() => setShowAddModal(false)} onSuccess={loadPrograms} />+ <EditProgramModal+ isOpen={showEditModal}+ onClose={() => { setShowEditModal(false); setEditingId(null) }}+ onSuccess={loadPrograms}+ programId={editingId || 0}+ />+ </div>+ )+}diff --git a/web/src/pages/Workouts.tsx b/web/src/pages/Workouts.tsxindex 5ff2330..e941e15 100644--- a/web/src/pages/Workouts.tsx+++ b/web/src/pages/Workouts.tsx@@ -1,22 +1,89 @@import { useState, useEffect } from 'react'import { format } from 'date-fns'-import { Dumbbell, Plus, ChevronRight, BarChart2, Clock, Weight, Search, AlertCircle } from 'lucide-react'-import { HelpTip } from '../components/Tooltip'+import { Dumbbell, Plus, ChevronDown, BarChart2, Clock, Search, AlertCircle, Edit2, Trash2, Flame, Target, TrendingUp } from 'lucide-react'import Loading from '../components/Loading'+import AddWorkoutModal from '../components/AddWorkoutModal'+import EditWorkoutModal from '../components/EditWorkoutModal'import { workoutAPI } from '../services/api'import * as types from '../types'-function WorkoutCard({ workout }: { workout: types.Workout }) {+const MUSCLE_COLORS: Record<string, string> = {+ chest: 'bg-red-500/15 text-red-400',+ back: 'bg-blue-500/15 text-blue-400',+ shoulders: 'bg-orange-500/15 text-orange-400',+ biceps: 'bg-purple-500/15 text-purple-400',+ triceps: 'bg-pink-500/15 text-pink-400',+ quadriceps: 'bg-green-500/15 text-green-400',+ hamstrings: 'bg-teal-500/15 text-teal-400',+ glutes: 'bg-yellow-500/15 text-yellow-400',+ calves: 'bg-lime-500/15 text-lime-400',+ abdominals: 'bg-amber-500/15 text-amber-400',+ forearms: 'bg-cyan-500/15 text-cyan-400',+ traps: 'bg-indigo-500/15 text-indigo-400',+ lats: 'bg-sky-500/15 text-sky-400',+}+function muscleColor(m: string) {+ return MUSCLE_COLORS[m?.toLowerCase()] || 'bg-surface-muted text-tx-muted'+}++function WorkoutCard({ workout, onEdit, onDelete }: { workout: types.Workout; onEdit: (id: number) => void; onDelete: (id: number) => void }) {const [open, setOpen] = useState(false)+ const [confirming, setConfirming] = useState(false)+ const [deleting, setDeleting] = useState(false)const durationMin = Math.round(workout.duration / 60)+ const handleDelete = async () => {+ setDeleting(true)+ try {+ await workoutAPI.delete(workout.id)+ onDelete(workout.id)+ } catch {+ setDeleting(false)+ setConfirming(false)+ }+ }++ if (confirming) {+ return (+ <div className="card overflow-hidden border-error-500/30">+ <div className="flex items-center justify-between p-4 bg-error-500/5">+ <div className="flex items-center gap-3">+ <div className="w-9 h-9 rounded-lg bg-error-500/10 border border-error-500/20 flex items-center justify-center flex-shrink-0">+ <Trash2 className="w-4 h-4 text-error-400" />+ </div>+ <div>+ <p className="text-sm font-semibold text-tx-primary">Delete "{workout.name}"?</p>+ <p className="text-xs text-tx-muted">This cannot be undone</p>+ </div>+ </div>+ <div className="flex items-center gap-2">+ <button+ onClick={() => setConfirming(false)}+ className="px-3 py-1.5 text-xs bg-surface-muted hover:bg-surface-muted/80 text-tx-secondary rounded-lg transition-colors font-medium"+ >+ Cancel+ </button>+ <button+ onClick={handleDelete}+ disabled={deleting}+ className="px-3 py-1.5 text-xs bg-error-500 hover:bg-error-600 disabled:opacity-50 text-white rounded-lg transition-colors font-medium flex items-center gap-1"+ >+ <Trash2 className="w-3 h-3" />+ {deleting ? 'Deleting…' : 'Delete'}+ </button>+ </div>+ </div>+ </div>+ )+ }+return (<div className="card overflow-hidden">- <button- className="w-full flex items-center justify-between p-4 hover:bg-surface-muted transition-colors"- onClick={() => setOpen(o => !o)}- >- <div className="flex items-center gap-3">+ <div className="flex items-center justify-between p-4 hover:bg-surface-muted transition-colors group">+ <button+ className="flex-1 flex items-center gap-3 min-w-0"+ onClick={() => setOpen(o => !o)}+ ><div className="w-9 h-9 rounded-lg bg-brand-500/10 border border-brand-500/20 flex items-center justify-center flex-shrink-0"><Dumbbell className="w-4 h-4 text-brand-500" strokeWidth={2} /></div>@@ -24,8 +91,8 @@ function WorkoutCard({ workout }: { workout: types.Workout }) {<p className="text-sm font-semibold text-tx-primary">{workout.name}</p><p className="text-xs text-tx-muted">{format(new Date(workout.started_at), 'MMM d, yyyy')}</p></div>- </div>- <div className="flex items-center gap-4">+ </button>+ <div className="flex items-center gap-2 sm:gap-4"><div className="hidden sm:flex items-center gap-4 text-xs text-tx-muted"><span className="flex items-center gap-1"><Clock className="w-3.5 h-3.5" /> {durationMin} min@@ -34,34 +101,108 @@ function WorkoutCard({ workout }: { workout: types.Workout }) {<BarChart2 className="w-3.5 h-3.5" /> {workout.exercises?.length || 0} exercises</span></div>- <ChevronRight className={`w-4 h-4 text-tx-muted transition-transform duration-200 ${open ? 'rotate-90' : ''}`} />+ <button+ onClick={e => { e.stopPropagation(); onEdit(workout.id) }}+ className="p-2 hover:bg-surface-muted rounded-lg transition-colors opacity-0 group-hover:opacity-100"+ title="Edit workout"+ >+ <Edit2 className="w-4 h-4 text-brand-500" />+ </button>+ <button+ onClick={e => { e.stopPropagation(); setConfirming(true) }}+ className="p-2 hover:bg-error-500/10 rounded-lg transition-colors opacity-0 group-hover:opacity-100"+ title="Delete workout"+ >+ <Trash2 className="w-4 h-4 text-error-400" />+ </button>+ <ChevronDown className={`w-4 h-4 text-tx-muted transition-transform duration-200 ${open ? 'rotate-180' : ''}`} /></div>- </button>+ </div>{open && (<div className="border-t border-surface-border animate-slide-up">- <div className="px-4 py-2">- <div className="grid grid-cols-4 text-xs text-tx-muted uppercase tracking-wider py-2 border-b border-surface-border">- <span className="col-span-2">Exercise</span>- <span className="text-right">Sets</span>- <span className="text-right">Avg Weight</span>+ {/* Workout stats bar */}+ <div className="grid grid-cols-3 divide-x divide-surface-border border-b border-surface-border">+ <div className="flex items-center gap-2 px-4 py-2.5">+ <Flame className="w-3.5 h-3.5 text-brand-500 flex-shrink-0" />+ <div>+ <p className="text-xs text-tx-muted">Exercises</p>+ <p className="text-sm font-semibold text-tx-primary tabular-nums">{workout.exercises?.length || 0}</p>+ </div>+ </div>+ <div className="flex items-center gap-2 px-4 py-2.5">+ <Target className="w-3.5 h-3.5 text-brand-500 flex-shrink-0" />+ <div>+ <p className="text-xs text-tx-muted">Total sets</p>+ <p className="text-sm font-semibold text-tx-primary tabular-nums">+ {workout.exercises?.reduce((s, e) => s + (e.sets?.length || 0), 0) || 0}+ </p>+ </div>+ </div>+ <div className="flex items-center gap-2 px-4 py-2.5">+ <TrendingUp className="w-3.5 h-3.5 text-brand-500 flex-shrink-0" />+ <div>+ <p className="text-xs text-tx-muted">Volume</p>+ <p className="text-sm font-semibold text-tx-primary tabular-nums">+ {Math.round(workout.exercises?.reduce((total, e) =>+ total + (e.sets?.reduce((s, set) => s + (set.reps || 0) * (set.weight || 0), 0) || 0), 0) || 0+ ).toLocaleString()} lbs+ </p>+ </div></div>+ </div>++ {/* Exercise cards */}+ <div className="p-3 space-y-2">{workout.exercises?.map((ex) => {- const avgWeight = ex.sets?.length > 0- ? (ex.sets.reduce((sum, s) => sum + (s.weight || 0), 0) / ex.sets.length).toFixed(0)- : '—'+ const maxWeight = ex.sets?.length > 0+ ? Math.max(...ex.sets.map(s => s.weight || 0))+ : 0+ const totalVol = ex.sets?.reduce((s, set) => s + (set.reps || 0) * (set.weight || 0), 0) || 0+return (- <div key={ex.id} className="grid grid-cols-4 text-sm py-2.5 border-b border-surface-border last:border-0">- <span className="col-span-2 text-tx-primary font-medium">{ex.exercise.name}</span>- <span className="text-right text-tx-secondary tabular-nums">{ex.sets?.length || 0}</span>- <span className="text-right text-tx-muted tabular-nums">{avgWeight} lbs</span>+ <div key={ex.id} className="bg-surface-muted/30 border border-surface-border rounded-xl p-3">+ {/* Exercise header */}+ <div className="flex items-start justify-between mb-2">+ <div className="flex items-start gap-2.5">+ <div className="w-8 h-8 rounded-lg bg-brand-500/10 border border-brand-500/20 flex items-center justify-center flex-shrink-0 mt-0.5">+ <Dumbbell className="w-3.5 h-3.5 text-brand-500" />+ </div>+ <div>+ <p className="text-sm font-semibold text-tx-primary leading-tight">{ex.exercise.name}</p>+ <span className={`inline-flex items-center px-1.5 py-0.5 rounded text-xs font-medium mt-1 ${muscleColor(ex.exercise.muscle_group)}`}>+ {ex.exercise.muscle_group}+ </span>+ </div>+ </div>+ <div className="text-right flex-shrink-0 ml-2">+ <p className="text-xs text-tx-muted">Best</p>+ <p className="text-sm font-bold text-brand-400 tabular-nums">{maxWeight > 0 ? `${maxWeight} lbs` : '—'}</p>+ </div>+ </div>++ {/* Sets inline */}+ <div className="flex flex-wrap gap-1.5 mt-2">+ {ex.sets?.map((set, i) => (+ <div key={i} className="flex items-center gap-1 bg-surface-raised px-2 py-1 rounded-lg border border-surface-border">+ <span className="text-xs text-tx-muted font-medium">#{set.set_number}</span>+ <span className="text-xs font-semibold text-tx-primary tabular-nums">+ {set.reps > 0 ? set.reps : '—'} × {set.weight > 0 ? `${set.weight}` : '0'}<span className="text-tx-muted font-normal">lb</span>+ </span>+ </div>+ ))}+ </div>++ {/* Volume */}+ {totalVol > 0 && (+ <p className="text-xs text-tx-muted mt-2">+ Volume: <span className="font-medium text-tx-secondary">{totalVol.toLocaleString()} lbs</span>+ </p>+ )}</div>)})}</div>- <div className="flex justify-end gap-2 px-4 py-3 bg-surface-muted">- <button className="btn-ghost btn-sm">Details</button>- </div></div>)}</div>@@ -73,19 +214,23 @@ export default function Workouts() {const [search, setSearch] = useState('')const [loading, setLoading] = useState(true)const [error, setError] = useState<string | null>(null)+ const [showAddModal, setShowAddModal] = useState(false)+ const [showEditModal, setShowEditModal] = useState(false)+ const [editingWorkoutId, setEditingWorkoutId] = useState<number | null>(null)- useEffect(() => {- const load = async () => {- try {- const data = await workoutAPI.list({ limit: 50 })- setWorkouts(data || [])- } catch (err: any) {- setError(err.message || 'Failed to load workouts')- } finally {- setLoading(false)- }+ const loadWorkouts = async () => {+ try {+ const data = await workoutAPI.list({ limit: 50 })+ setWorkouts(data || [])+ } catch (err: any) {+ setError(err.message || 'Failed to load workouts')+ } finally {+ setLoading(false)}- load()+ }++ useEffect(() => {+ loadWorkouts()}, [])const filtered = workouts.filter(w =>@@ -113,7 +258,7 @@ export default function Workouts() {<h1 className="font-display font-bold text-2xl text-tx-primary">Workouts</h1><p className="text-tx-muted text-sm mt-0.5">Track and review your training sessions</p></div>- <button className="btn-primary btn-md">+ <button onClick={() => setShowAddModal(true)} className="btn-primary btn-md"><Plus className="w-4 h-4" /> Log Workout</button></div>@@ -159,9 +304,30 @@ export default function Workouts() {<p className="text-xs text-tx-muted">{search ? 'Try a different search' : 'Log a workout to get started'}</p></div>) : (- filtered.map(w => <WorkoutCard key={w.id} workout={w} />)+ filtered.map(w => <WorkoutCard key={w.id} workout={w}+ onEdit={(id) => { setEditingWorkoutId(id); setShowEditModal(true) }}+ onDelete={(id) => setWorkouts(prev => prev.filter(x => x.id !== id))}+ />))}</div>++ {/* Add workout modal */}+ <AddWorkoutModal+ isOpen={showAddModal}+ onClose={() => setShowAddModal(false)}+ onSuccess={() => loadWorkouts()}+ />++ {/* Edit workout modal */}+ <EditWorkoutModal+ isOpen={showEditModal}+ onClose={() => {+ setShowEditModal(false)+ setEditingWorkoutId(null)+ }}+ onSuccess={() => loadWorkouts()}+ workoutId={editingWorkoutId || 0}+ /></div>)}diff --git a/web/src/services/api.ts b/web/src/services/api.tsindex f5242db..c71a5bd 100644--- a/web/src/services/api.ts+++ b/web/src/services/api.ts@@ -65,13 +65,48 @@ export const workoutAPI = {api.get<{ data: types.Workout[] }>('/workouts', { params }).then(res => unwrap(res)),get: (id: number) => api.get<{ data: types.Workout }>(`/workouts/${id}`).then(res => unwrap(res)),create: (data: any) => api.post<{ data: types.Workout }>('/workouts', data).then(res => unwrap(res)),+ update: (id: number, data: any) => api.put<{ data: types.Workout }>(`/workouts/${id}`, data).then(res => unwrap(res)),delete: (id: number) => api.delete(`/workouts/${id}`),}+let _exerciseCache: types.Exercise[] | null = null+let _exerciseCachePromise: Promise<types.Exercise[]> | null = null+export const exerciseAPI = {- list: (params?: { q?: string; muscle_group?: string; category?: string; equipment?: string }) =>- api.get<{ data: types.Exercise[] }>('/exercises', { params }).then(res => unwrap(res)),- get: (id: number) => api.get<{ data: types.Exercise }>(`/exercises/${id}`).then(res => unwrap(res)),+ list: (params?: { q?: string; muscle_group?: string; category?: string; equipment?: string }) => {+ if (params?.q || params?.muscle_group || params?.category || params?.equipment) {+ return api.get<{ data: types.Exercise[] }>('/exercises', { params }).then(res => unwrap(res))+ }+ if (_exerciseCache) return Promise.resolve(_exerciseCache)+ if (_exerciseCachePromise) return _exerciseCachePromise+ _exerciseCachePromise = api.get<{ data: types.Exercise[] }>('/exercises', { params: { limit: 1000 } })+ .then(res => {+ _exerciseCache = unwrap(res)+ _exerciseCachePromise = null+ return _exerciseCache+ })+ return _exerciseCachePromise+ },+ get: (id: number) => api.get<{ data: types.Exercise }>(`/exercises/${id}`).then(res => unwrap(res)),+ clearCache: () => { _exerciseCache = null; _exerciseCachePromise = null },+}++export const activeSessionAPI = {+ get: () => api.get<{ data: { data: string; updated_at: string } | null }>('/active-session').then(res => {+ const payload = res.data.data+ if (!payload) return null+ try { return JSON.parse(payload.data) } catch { return null }+ }),+ save: (session: any) => api.put('/active-session', { data: JSON.stringify(session) }),+ clear: () => api.delete('/active-session'),+}++export const programAPI = {+ list: () => api.get<{ data: types.Program[] }>('/programs').then(res => unwrap(res)),+ get: (id: number) => api.get<{ data: types.Program }>(`/programs/${id}`).then(res => unwrap(res)),+ create: (data: any) => api.post<{ data: types.Program }>('/programs', data).then(res => unwrap(res)),+ update: (id: number, data: any) => api.put<{ data: types.Program }>(`/programs/${id}`, data).then(res => unwrap(res)),+ delete: (id: number) => api.delete(`/programs/${id}`),}export const weightAPI = {diff --git a/web/src/stores/workoutSession.ts b/web/src/stores/workoutSession.tsnew file mode 100644index 0000000..9e6aaf9--- /dev/null+++ b/web/src/stores/workoutSession.ts@@ -0,0 +1,193 @@+import { create } from 'zustand'+import * as types from '../types'+import { activeSessionAPI } from '../services/api'++const SESSION_KEY = 'lyftr_active_session'+const DEVICE_KEY = 'lyftr_device_id'++function getDeviceId(): string {+ let id = localStorage.getItem(DEVICE_KEY)+ if (!id) {+ id = crypto.randomUUID()+ localStorage.setItem(DEVICE_KEY, id)+ }+ return id+}++interface WorkoutSessionStore {+ session: types.ActiveSession | null+ syncing: boolean+ startSession: (name: string, exercises: types.ActiveSessionExercise[], programId?: number) => void+ updateSet: (exIdx: number, setIdx: number, field: 'actual_reps' | 'actual_weight', val: number) => void+ completeSet: (exIdx: number, setIdx: number) => void+ addSet: (exIdx: number) => void+ addExercise: (ex: types.ActiveSessionExercise) => void+ removeExercise: (exIdx: number) => void+ buildPayload: () => any+ cancelSession: () => void+ restoreFromServer: () => Promise<void>+}++function saveLocal(session: types.ActiveSession | null) {+ if (session) {+ localStorage.setItem(SESSION_KEY, JSON.stringify(session))+ } else {+ localStorage.removeItem(SESSION_KEY)+ }+}++function loadLocal(): types.ActiveSession | null {+ try {+ const raw = localStorage.getItem(SESSION_KEY)+ return raw ? JSON.parse(raw) : null+ } catch {+ return null+ }+}++// Debounced backend sync — 2s after last change+let syncTimer: ReturnType<typeof setTimeout> | null = null+function scheduleSync(session: types.ActiveSession) {+ if (syncTimer) clearTimeout(syncTimer)+ syncTimer = setTimeout(() => {+ activeSessionAPI.save(session).catch(() => {})+ }, 2000)+}++function flushSync(session: types.ActiveSession) {+ if (syncTimer) { clearTimeout(syncTimer); syncTimer = null }+ return activeSessionAPI.save(session)+}++export const useWorkoutSession = create<WorkoutSessionStore>((set, get) => ({+ session: loadLocal(),+ syncing: false,++ startSession: (name, exercises, programId) => {+ const session: types.ActiveSession = {+ name,+ started_at: new Date().toISOString(),+ exercises,+ program_id: programId,+ device_id: getDeviceId(),+ }+ saveLocal(session)+ set({ session })+ flushSync(session).catch(() => {})+ },++ updateSet: (exIdx, setIdx, field, val) => {+ const session = get().session+ if (!session) return+ const exercises = session.exercises.map((ex, i) =>+ i !== exIdx ? ex : {+ ...ex,+ sets: ex.sets.map((s, j) => j === setIdx ? { ...s, [field]: val } : s),+ }+ )+ const updated = { ...session, exercises }+ saveLocal(updated)+ set({ session: updated })+ scheduleSync(updated)+ },++ completeSet: (exIdx, setIdx) => {+ const session = get().session+ if (!session) return+ const exercises = session.exercises.map((ex, i) =>+ i !== exIdx ? ex : {+ ...ex,+ sets: ex.sets.map((s, j) => j === setIdx ? { ...s, completed: !s.completed } : s),+ }+ )+ const updated = { ...session, exercises }+ saveLocal(updated)+ set({ session: updated })+ flushSync(updated).catch(() => {})+ },++ addSet: (exIdx) => {+ const session = get().session+ if (!session) return+ const exercises = session.exercises.map((ex, i) => {+ if (i !== exIdx) return ex+ const last = ex.sets[ex.sets.length - 1]+ return {+ ...ex,+ sets: [...ex.sets, {+ set_number: ex.sets.length + 1,+ target_reps: last?.target_reps ?? 0,+ target_weight: last?.target_weight ?? 0,+ actual_reps: last?.actual_reps ?? 0,+ actual_weight: last?.actual_weight ?? 0,+ completed: false,+ }],+ }+ })+ const updated = { ...session, exercises }+ saveLocal(updated)+ set({ session: updated })+ scheduleSync(updated)+ },++ addExercise: (ex) => {+ const session = get().session+ if (!session) return+ const updated = { ...session, exercises: [...session.exercises, ex] }+ saveLocal(updated)+ set({ session: updated })+ scheduleSync(updated)+ },++ removeExercise: (exIdx) => {+ const session = get().session+ if (!session) return+ const updated = { ...session, exercises: session.exercises.filter((_, i) => i !== exIdx) }+ saveLocal(updated)+ set({ session: updated })+ scheduleSync(updated)+ },++ buildPayload: () => {+ const session = get().session+ if (!session) return null+ const durationSec = Math.round((Date.now() - new Date(session.started_at).getTime()) / 1000)+ return {+ name: session.name,+ notes: '',+ duration: durationSec,+ started_at: session.started_at,+ exercises: session.exercises.map(ex => ({+ exercise_id: ex.exercise_id,+ notes: ex.notes,+ sets: ex.sets.map((s, i) => ({+ set_number: i + 1,+ reps: s.actual_reps || s.target_reps,+ weight: s.actual_weight || s.target_weight,+ })),+ })),+ }+ },++ cancelSession: () => {+ if (syncTimer) { clearTimeout(syncTimer); syncTimer = null }+ saveLocal(null)+ set({ session: null })+ activeSessionAPI.clear().catch(() => {})+ },++ restoreFromServer: async () => {+ // Only restore from server if this device has no local session (crash recovery)+ const local = loadLocal()+ if (local) return+ try {+ const serverSession = await activeSessionAPI.get()+ if (serverSession && serverSession.device_id === getDeviceId()) {+ saveLocal(serverSession)+ set({ session: serverSession })+ }+ } catch {+ // offline or unauthenticated — nothing to restore+ }+ },+}))diff --git a/web/src/types.ts b/web/src/types.tsindex 3864b91..40c0324 100644--- a/web/src/types.ts+++ b/web/src/types.ts@@ -98,6 +98,54 @@ export interface WeightStats {total_entries: number}+export interface ProgramSet {+ id?: number+ set_number: number+ target_reps: number+ target_weight: number+}++export interface ProgramExercise {+ id?: number+ exercise_id: number+ order_index?: number+ notes?: string+ exercise: Exercise+ sets: ProgramSet[]+}++export interface Program {+ id: number+ name: string+ notes?: string+ created_at: string+ exercises: ProgramExercise[]+}++export interface ActiveSessionSet {+ set_number: number+ target_reps: number+ target_weight: number+ actual_reps: number+ actual_weight: number+ completed: boolean+}++export interface ActiveSessionExercise {+ exercise_id: number+ exercise: Exercise+ notes: string+ sets: ActiveSessionSet[]+}++export interface ActiveSession {+ program_id?: number+ name: string+ started_at: string+ exercises: ActiveSessionExercise[]+ device_id?: string+}+export interface AuthResponse {token: stringrefresh_token: string