docs: add branching strategy - one feature per branch

- Each phase gets its own branch
- Branch from previous phase to inherit work
- Rebase onto main before creating PR
- Keeps history clean and reviews focused

.gitignore

@@ -0,0 +1,54 @@
+# Dependencies
+node_modules/
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+# Build & dist
+dist/
+build/
+*.bundle.js
+*.bundle.css
+
+# Environment
+.env
+.env.local
+.env.*.local
+.env.production.local
+
+# IDE
+.vscode/
+.idea/
+*.swp
+*.swo
+*~
+.DS_Store
+
+# OS
+Thumbs.db
+.DS_Store
+
+# Logs
+*.log
+logs/
+
+# Test coverage
+.coverage/
+coverage/
+
+# Python
+*.pyc
+__pycache__/
+*.py~
+
+# Staging
+/tmp/
+/staging-*/
+
+# Planning & Documentation (kept locally, not in repo)
+.planning/
+TODO.md
+./frontend/.planning/
+./frontend/tasks/
+./docs/plans/
+.claude/settings.local.json

.pm-checkpoint.json

@@ -1,8 +1,20 @@
 {
-  "lastRun": "2026-02-28T23:45:00+01:00",
+  "lastRun": "2026-03-02T03:55:00Z",
-  "status": "completed",
+  "status": "blocked",
-  "tasksCompleted": ["emoji-replacement", "alternative-modal", "workout-page-ux-redish", "chat-onboarding", "03-01-login-onboarding-polish", "03-02-dashboard-polish", "03-03-workout-experience-polish"],
+  "phase": "04-workout-modification",
-  "activeTask": null,
+  "milestone": "PHASE_04_COMPLETE",
-  "nextTask": null,
+  "completedTasks": [
-  "notes": "03-03 Workout Experience Polish complete (commit f6b1379). Phase 3 complete: login/onboarding, dashboard, and workout experience all polished."
+    "04-01-database-schema",
+    "04-02-backend-api",
+    "04-03-frontend-edit-mode",
+    "04-04-visual-distinction",
+    "04-05-reset-option",
+    "04-06-01-draft-persistence",
+    "04-06-02-error-recovery",
+    "04-06-03-sync-status-ui"
+  ],
+  "result": "Phase 04 (Workout Modification) complete. Users can now fork and customize program workouts with persistent, error-resistant, real-time sync feedback. Next phase awaits definition.",
+  "blockReason": "No 04-06-04 spec or 05-* phase defined. Awaiting human direction for next feature.",
+  "recommendation": "Options: (1) Define and execute 04-06-04 performance optimization, (2) Start phase 05 (new feature), (3) User reviews completeness and prioritizes next work",
+  "nextAction": "Await phase definition in workspace planning docs or manual prompt"
 }

CLAUDE.md

@@ -0,0 +1,499 @@
+# CLAUDE.md — Agent Development Foundation
+
+This document is **THE** foundation for developing Claude agents and autonomous systems in Gravl.  
+Together with the actual codebase, this is your north star.
+
+## Part 1: Agent Development Principles
+
+### 1. Autonomy with Verification
+- Agents execute tasks independently
+- **Always verify results** after delegation (no hallucinations)
+- Verification pattern: `git status`, `git log`, `ls`, diff before checkpoint update
+- Never report completion without checking actual work
+
+### 2. Checkpoint-Based Self-Monitoring
+All long-running tasks use checkpoint files:
+
+```json
+{
+  "lastRun": "2026-03-02T08:00:00Z",
+  "status": "completed|blocked|interrupted|error",
+  "result": "Summary of work",
+  "nextCheck": "What to do next"
+}
+```
+
+**Recovery logic:**
+- If `lastRun > 60min` OR `status ≠ "completed"` → trigger recovery
+- Log recovery attempts to help debugging
+- Use simple JSON for checkpoint files (no complex parsing)
+
+### 3. PM (Project Manager) Autonomy
+The Gravl PM agent:
+- Plans sprints/phases autonomously
+- Spawns specialized agents (frontend-dev, backend-dev, etc.)
+- Verifies their work **before** checkpoint completion
+- Reports progress to Telegram (not silent failures)
+- Timeout: 15 minutes (900s) per cron cycle
+
+### 4. Generalized Agents (Reusable)
+**NEVER create project-specific agents.**
+
+Use generalized agents instead:
+- `frontend-dev` — React/CSS specialist
+- `backend-dev` — Node.js/PostgreSQL specialist
+- `architect` — System design
+- `reviewer` — Code review + quality gates
+- `browser-tester` — E2E testing + QA
+
+These live in `~/clawd/claude-agents-skills/agents/` and symlink to `~/clawd/agents/`.
+
+### 5. Single Source of Truth
+All skills and agents in ONE central repo:
+- **Hub location:** `~/clawd/claude-agents-skills/`
+- **Symlinks from:** `~/clawd/skills/` and `~/clawd/agents/`
+- Commit all changes to hub repo
+- Enables sharing, versioning, and collaboration
+
+### 6. Communication Pattern
+- PM drives autonomously
+- Silence = approval (no blocking)
+- Report **only** at milestones or blocking issues
+- Use Telegram for delivery (explicit `"channel: telegram"`)
+
+---
+
+## Part 2: Coding Conventions (MANDATORY)
+
+### Red/Green/Refactor TDD (OBLIGATORY)
+
+All new code follows the TDD cycle:
+
+```
+🔴 RED → 🟢 GREEN → 🔄 REFACTOR
+```
+
+#### Step 1: 🔴 RED - Write Failing Test First
+
+```javascript
+// test/feature.test.js
+describe('Feature', () => {
+  it('should do expected behavior', async () => {
+    const result = await feature.doSomething();
+    expect(result).toBe(expected);
+  });
+});
+```
+
+**Run the test - it MUST fail!**
+```bash
+npm test -- --grep "Feature"
+# ❌ FAIL (this is correct!)
+```
+
+#### Step 2: 🟢 GREEN - Minimal Implementation
+
+Write just enough code to pass the test:
+
+```javascript
+// src/feature.js
+export function doSomething() {
+  return expected; // Minimal solution
+}
+```
+
+**Run the test again:**
+```bash
+npm test -- --grep "Feature"
+# ✅ PASS
+```
+
+#### Step 3: 🔄 REFACTOR - Improve
+
+Now you can:
+- Refactor for clean code
+- Extract functions
+- Improve naming
+- Remove duplication
+
+**Run tests continuously:**
+```bash
+npm test
+# ✅ All tests must still pass
+```
+
+### Test Structure
+
+```
+/workspace/gravl/
+├── src/
+│   └── components/
+├── server/
+│   └── routes/
+└── test/
+    ├── unit/           # Unit tests
+    ├── integration/    # API tests
+    └── e2e/            # End-to-end (Playwright)
+```
+
+### Naming Conventions
+
+#### Test Files
+- `[feature].test.js` — Unit tests
+- `[feature].integration.test.js` — Integration tests
+- Describe block: Noun (what is tested)
+- It block: "should [verb] [expected outcome]"
+
+#### Commits
+```
+test: add failing test for [feature]
+feat: implement [feature] to pass tests
+refactor: clean up [feature] implementation
+```
+
+### Agent Workflow (Step-by-Step)
+
+When spawned with a coding task:
+
+1. **Read the spec** → Check docs/current-task.md
+2. **Write failing test** → Show to PM that you understand the requirement
+3. **Implement code** → Make the test pass (minimal solution)
+4. **Refactor** → Clean code if needed
+5. **Run full test suite** → Ensure nothing broke
+6. **Commit with proper prefix** → `test:`, `feat:`, `refactor:`
+7. **Report to PM** → Include git log, test results
+8. **Verification** → PM checks `git status`, `git log`, diffs
+
+---
+
+## Part 3: Operations
+
+### Cron Jobs (3 Active)
+
+| Job | Schedule | Timeout | Checkpoint | Status |
+|-----|----------|---------|-----------|--------|
+| Gravl PM | Every 30m | 15 min | `/workspace/gravl/.pm-checkpoint.json` | Active |
+| Vietnam Flights | Daily 09:00 | 2 min | `~/.checkpoint-vietnam-flights.json` | Active |
+| System Updates | Daily 10:00 | 5 min | `~/.checkpoint-system-updates.json` | Active |
+
+All use explicit `"channel: telegram"` for Telegram delivery.
+
+### Repository Structure
+
+```
+/workspace/gravl/
+├── frontend/              # React app
+├── backend/               # Express API
+├── db/                    # Database setup + migrations
+├── scripts/               # Automation scripts
+├── docker/                # Compose files
+├── test/                  # Test suites
+├── docs/
+│   └── CODING-CONVENTIONS.md  # (Deprecated, see CLAUDE.md)
+├── README.md              # Project overview
+├── CLAUDE.md              # THIS FILE — Agent & coding foundation
+└── .gitignore             # Excludes node_modules, planning docs
+```
+
+### Local-Only Files (Not in Git)
+
+These stay on disk but excluded via `.gitignore`:
+- `.planning/` — research, requirements, roadmap
+- `TODO.md` — task tracking
+- `frontend/tasks/` — feature tasks
+- `docs/plans/` — planning notes
+
+This keeps the repo clean while preserving planning work locally.
+
+---
+
+## Part 4: Agent Development Workflow
+
+### Adding a New Agent
+
+1. Create in hub: `~/clawd/claude-agents-skills/agents/my-agent/`
+2. Write `SOUL.md` (agent definition, personality, expertise)
+3. Optional: Add `README.md`, scripts, config files
+4. Symlink automatically created: `~/clawd/agents/my-agent`
+5. Commit to hub repo
+
+Example SOUL.md:
+```markdown
+# My Agent SOUL
+
+## Core Identity
+- Name: [Agent Name]
+- Expertise: [Domain]
+- Personality: [Vibe]
+
+## Instructions
+1. [Guideline 1]
+2. [Guideline 2]
+
+## Communication
+- Report at milestones
+- Verify before completion
+```
+
+### Adding a New Skill
+
+1. Create in hub: `~/clawd/claude-agents-skills/skills/my-skill/`
+2. Write `SKILL.md` (documentation, usage, examples)
+3. Add code/scripts
+4. Symlink automatically created: `~/clawd/skills/my-skill`
+5. Commit to hub repo
+
+### Verification Pattern (CRITICAL)
+
+After any subagent completes work:
+
+```bash
+# 1. Check git status
+git status
+
+# 2. Verify files changed
+git log --oneline -3
+
+# 3. Inspect actual changes
+git diff HEAD~1
+
+# 4. ONLY THEN update checkpoint
+echo '{
+  "lastRun": "'$(date -Iseconds)'",
+  "status": "completed",
+  "result": "Summary..."
+}' > checkpoint.json
+```
+
+**This prevents hallucination bugs** where agents claim work they didn't do.
+
+---
+
+## Key Decisions
+
+1. **Generalized agents** — Reusable, maintainable, shareable
+2. **Single hub repo** — Centralized versioning
+3. **Symlinks for discovery** — OpenClaw finds everything automatically
+4. **TDD mandatory** — Red → Green → Refactor
+5. **Verification protocol** — No hallucinations allowed
+6. **Checkpoint-based recovery** — Self-healing cron jobs
+7. **Telegram delivery** — Explicit channel routing
+
+---
+
+## PM Agent Playbook (30-minute cycles)
+
+1. **Plan** → Identify phase tasks, delegate to agents
+2. **Execute** → Spawn agents with tasks, monitor progress
+3. **Verify** → Check `git status`, diffs, test results (NO ASSUMPTIONS)
+4. **Report** → Send Telegram update (success or blocking issue)
+5. **Checkpoint** → Update `.pm-checkpoint.json` with status + nextCheck
+
+PM runs autonomously every 30 minutes. **No human approval needed unless blocked.**
+
+---
+
+## References
+
+- **Agent Symlink Hub:** `~/clawd/claude-agents-skills/`
+- **Frontend Stack:** React + Vite + Tailwind
+- **Backend Stack:** Express + PostgreSQL
+- **Testing:** Jest (unit), Playwright (E2E)
+- **Database:** PostgreSQL with migrations
+- **Deployment:** Docker Compose (local), staging via Traefik
+
+---
+
+**Last Updated:** 2026-03-02  
+**Version:** 1.0  
+**Audience:** All Claude agents, PM, developers
+
+> **Remember:** This document is your north star. Follow it. Extend it. Improve it.
+
+---
+
+## Part 5: Git Hygiene - Keep the Repo Clean
+
+### No "Fix" Commits
+❌ **NEVER** commit fixes for typos, syntax errors, or accidentally added files:
+```bash
+# BAD - Creates noise in history:
+commit 1a2b3c: feat: add feature
+commit 1a2b3d: fix: typo in feature  ← NO!
+commit 1a2b3e: chore: remove extra file  ← NO!
+```
+
+✅ **INSTEAD:** Use interactive rebase to clean up BEFORE pushing:
+```bash
+# GOOD - Clean, single commit:
+commit 1a2b3c: feat: add feature (with typo fixed)
+```
+
+### Interactive Rebase Workflow
+
+**1. Check recent commits:**
+```bash
+git log --oneline -5
+# abc1234 feat: add feature
+# def5678 fix: typo in feature        ← Oops!
+# ghi9012 chore: remove extra file    ← Oops!
+```
+
+**2. Rebase the last 3 commits:**
+```bash
+git rebase -i HEAD~3
+```
+
+**3. Edit in your editor:**
+```
+pick abc1234 feat: add feature
+squash def5678 fix: typo in feature
+squash ghi9012 chore: remove extra file
+```
+
+Change `pick` to `squash` (or `s`) for commits you want to merge into the previous one.
+
+**4. Save and edit the commit message:**
+The editor will ask for a final commit message. Edit it to be clean:
+```
+feat: add feature
+
+- Added feature X
+- Removed extra file
+```
+
+**5. Force-push (only if not yet pushed):**
+```bash
+git push -f origin branch-name
+```
+
+### When to Rebase
+
+- ✅ **Before first push** — Fix typos, add forgotten files
+- ✅ **Before review** — Squash "work in progress" commits
+- ❌ **After pushed to shared branch** — Don't force-push to main/develop
+
+### Common Rebase Scenarios
+
+**Fix a typo in last commit:**
+```bash
+git commit --amend
+# Edit the file, save
+# Git updates the commit without a new one
+```
+
+**Reorder commits:**
+```bash
+git rebase -i HEAD~3
+# Reorder the lines in the editor
+```
+
+**Combine last 2 commits:**
+```bash
+git rebase -i HEAD~2
+# Change second line from "pick" to "squash"
+```
+
+### Rule of Thumb
+
+**One logical change = One commit**
+
+If you're writing a commit message that says "fixed typo from previous commit", you should have rebased instead.
+
+
+---
+
+## Part 6: Branching Strategy - One Feature Per Branch
+
+### The Workflow
+
+**Each phase/feature gets its own branch:**
+
+```
+main
+ └─ feature/03-design-polish (Phase 03)
+     └─ feature/04-workout-modification (Phase 04, branched from 03)
+         └─ feature/05-exercise-encyclopedia (Phase 05, branched from 04)
+```
+
+### Step-by-Step
+
+#### 1. Work on Phase 03
+```bash
+git checkout -b feature/03-design-polish
+# ... do all Phase 03 work ...
+# Multiple commits, testing, refinement
+git push origin feature/03-design-polish
+```
+
+#### 2. When Phase 03 is Done → Create PR
+```bash
+# Create PR: feature/03-design-polish → main
+# Get code review, merge when approved
+# This becomes the baseline for Phase 04
+```
+
+#### 3. Start Phase 04 (NEW BRANCH from Phase 03)
+```bash
+# First, make sure local is up-to-date
+git checkout feature/03-design-polish
+git pull origin feature/03-design-polish
+
+# Create new branch FROM the current feature
+git checkout -b feature/04-workout-modification
+
+# Now do all Phase 04 work on this new branch
+# ... commits for 04-01, 04-02, 04-03, etc ...
+git push origin feature/04-workout-modification
+```
+
+#### 4. When Phase 04 is Done → Rebase Before PR
+```bash
+# Make sure feature/03 is merged to main
+git fetch origin
+
+# Rebase Phase 04 onto main (to get clean history)
+git rebase origin/main feature/04-workout-modification
+
+# Force-push (since we're rebasing)
+git push -f origin feature/04-workout-modification
+
+# Create PR: feature/04-workout-modification → main
+```
+
+### Why This Matters
+
+- ✅ **Cleaner history** — Each phase is separate
+- ✅ **Easier reviews** — PRs are focused on one phase
+- ✅ **Better testing** — Each phase tested independently
+- ✅ **Easy rollback** — Remove one phase without touching others
+- ✅ **Work in parallel** — Different agents can work on different phases
+
+### Current Situation
+
+We've mixed Phase 03 and 04 in `feature/03-design-polish`. Going forward:
+
+1. **Merge feature/03-design-polish → main** (code review, then merge)
+2. **Create feature/04-workout-modification** from main
+3. Move/cherry-pick Phase 04 commits to new branch (or just continue from here)
+4. **Create feature/05-exercise-encyclopedia** from feature/04 when 04 is done
+
+### Rebase Chain Example
+
+```bash
+# After 03 is merged and 04 starts:
+git checkout feature/04-workout-modification
+git rebase origin/main  # Rebase 04 onto latest main
+
+# After 04 is merged and 05 starts:
+git checkout feature/05-exercise-encyclopedia
+git rebase origin/main  # Always rebase new features onto main
+```
+
+### Rule of Thumb
+
+- **One feature per branch**
+- **Each branch is independent**
+- **Rebase onto main before PR**
+- **No "feature/03-design-polish" commits after it's merged**
+

backend/src/index.js

@@ -303,107 +303,6 @@ app.get('/api/exercises/:id/last-workout', async (req, res) => {
   }
 });
 
-// Get workout logs for a user and date
-app.get('/api/logs', async (req, res) => {
-  try {
-    const { user_id, date, program_exercise_id } = req.query;
-    let query = 'SELECT * FROM workout_logs WHERE 1=1';
-    const params = [];
-    
-    if (user_id) {
-      params.push(user_id);
-      query += ` AND user_id = $${params.length}`;
-    }
-    if (date) {
-      params.push(date);
-      query += ` AND date = $${params.length}`;
-    }
-    if (program_exercise_id) {
-      params.push(program_exercise_id);
-      query += ` AND program_exercise_id = $${params.length}`;
-    }
-    
-    query += ' ORDER BY date DESC, set_number ASC';
-    
-    const result = await pool.query(query, params);
-    res.json(result.rows);
-  } catch (err) {
-    console.error('Error fetching logs:', err);
-    res.status(500).json({ error: 'Database error' });
-  }
-});
-
-// Get last workout for an exercise (for progression)
-app.get('/api/logs/last/:programExerciseId', async (req, res) => {
-  try {
-    const { user_id } = req.query;
-    const result = await pool.query(`
-      SELECT * FROM workout_logs 
-      WHERE program_exercise_id = $1 AND user_id = $2
-      ORDER BY date DESC, set_number ASC
-      LIMIT 10
-    `, [req.params.programExerciseId, user_id || 1]);
-    res.json(result.rows);
-  } catch (err) {
-    console.error('Error fetching last workout:', err);
-    res.status(500).json({ error: 'Database error' });
-  }
-});
-
-// Log a set
-app.post('/api/logs', async (req, res) => {
-  try {
-    const { user_id, program_exercise_id, date, set_number, weight, reps, completed } = req.body;
-    
-    // Check if log exists for this set
-    const existing = await pool.query(
-      'SELECT id FROM workout_logs WHERE user_id = $1 AND program_exercise_id = $2 AND date = $3 AND set_number = $4',
-      [user_id, program_exercise_id, date, set_number]
-    );
-    
-    let result;
-    if (existing.rows.length > 0) {
-      // Update existing
-      result = await pool.query(
-        'UPDATE workout_logs SET weight = $1, reps = $2, completed = $3 WHERE id = $4 RETURNING *',
-        [weight, reps, completed, existing.rows[0].id]
-      );
-    } else {
-      // Insert new
-      result = await pool.query(
-        'INSERT INTO workout_logs (user_id, program_exercise_id, date, set_number, weight, reps, completed) VALUES ($1, $2, $3, $4, $5, $6, $7) RETURNING *',
-        [user_id, program_exercise_id, date, set_number, weight, reps, completed]
-      );
-    }
-    
-    res.json(result.rows[0]);
-  } catch (err) {
-    console.error('Error logging set:', err);
-    res.status(500).json({ error: 'Database error' });
-  }
-});
-
-// Delete a specific set log
-app.delete('/api/logs', async (req, res) => {
-  try {
-    const { user_id, program_exercise_id, date, set_number } = req.body;
-
-    const result = await pool.query(
-      'DELETE FROM workout_logs WHERE user_id = $1 AND program_exercise_id = $2 AND date = $3 AND set_number = $4 RETURNING id',
-      [user_id, program_exercise_id, date, set_number]
-    );
-
-    if (result.rows.length === 0) {
-      return res.status(404).json({ error: 'Log not found' });
-    }
-
-    res.json({ deleted: result.rows[0].id });
-  } catch (err) {
-    console.error('Error deleting log:', err);
-    res.status(500).json({ error: 'Database error' });
-  }
-});
-
 // Calculate suggested weight based on progression
 app.get('/api/progression/:programExerciseId', async (req, res) => {
   try {
@@ -498,3 +397,370 @@ app.get('/api/today/:programId', async (req, res) => {
 app.listen(PORT, () => {
   console.log(`Gravl API running on port ${PORT}`);
 });
+
+// ============================================
+// Custom Workouts API (Phase 4: Workout Modification)
+// ============================================
+
+// Get all exercises (for picker UI)
+app.get('/api/exercises', async (req, res) => {
+  try {
+    const result = await pool.query(
+      'SELECT id, name, muscle_group, description FROM exercises ORDER BY muscle_group, name'
+    );
+    res.json(result.rows);
+  } catch (err) {
+    console.error('Error fetching exercises:', err);
+    res.status(500).json({ error: 'Database error' });
+  }
+});
+
+// Create custom workout from program day (fork)
+app.post('/api/custom-workouts', authMiddleware, async (req, res) => {
+  const client = await pool.connect();
+  try {
+    const { source_program_day_id, name, description } = req.body;
+    const user_id = req.user.id;
+
+    await client.query('BEGIN');
+
+    // Get the program day info and its exercises
+    const dayResult = await client.query(
+      'SELECT name, program_id FROM program_days WHERE id = $1',
+      [source_program_day_id]
+    );
+
+    if (dayResult.rows.length === 0) {
+      await client.query('ROLLBACK');
+      return res.status(404).json({ error: 'Program day not found' });
+    }
+
+    const dayName = dayResult.rows[0].name;
+    const workoutName = name || `${dayName} (anpassad)`;
+
+    // Create custom workout
+    const workoutResult = await client.query(
+      `INSERT INTO custom_workouts (user_id, name, description, source_program_day_id)
+       VALUES ($1, $2, $3, $4) RETURNING *`,
+      [user_id, workoutName, description || null, source_program_day_id]
+    );
+    const customWorkout = workoutResult.rows[0];
+
+    // Copy exercises from program day
+    const exercisesResult = await client.query(
+      `INSERT INTO custom_workout_exercises 
+       (custom_workout_id, exercise_id, sets, reps_min, reps_max, order_index, replaced_exercise_id)
+       SELECT $1, exercise_id, sets, reps_min, reps_max, order_num, NULL
+       FROM program_exercises WHERE program_day_id = $2
+       RETURNING *`,
+      [customWorkout.id, source_program_day_id]
+    );
+
+    await client.query('COMMIT');
+
+    res.json({
+      ...customWorkout,
+      exercises: exercisesResult.rows
+    });
+  } catch (err) {
+    await client.query('ROLLBACK');
+    console.error('Error creating custom workout:', err);
+    res.status(500).json({ error: 'Database error' });
+  } finally {
+    client.release();
+  }
+});
+
+// List user's custom workouts
+app.get('/api/custom-workouts', authMiddleware, async (req, res) => {
+  try {
+    const user_id = req.user.id;
+    const result = await pool.query(
+      `SELECT cw.*, pd.name as original_day_name, p.name as program_name
+       FROM custom_workouts cw
+       LEFT JOIN program_days pd ON cw.source_program_day_id = pd.id
+       LEFT JOIN programs p ON pd.program_id = p.id
+       WHERE cw.user_id = $1
+       ORDER BY cw.created_at DESC`,
+      [user_id]
+    );
+    res.json(result.rows);
+  } catch (err) {
+    console.error('Error fetching custom workouts:', err);
+    res.status(500).json({ error: 'Database error' });
+  }
+});
+
+// Get single custom workout with exercises
+app.get('/api/custom-workouts/:id', authMiddleware, async (req, res) => {
+  try {
+    const user_id = req.user.id;
+    const workout_id = req.params.id;
+
+    // Get workout header
+    const workoutResult = await pool.query(
+      `SELECT cw.*, pd.name as original_day_name, p.name as program_name
+       FROM custom_workouts cw
+       LEFT JOIN program_days pd ON cw.source_program_day_id = pd.id
+       LEFT JOIN programs p ON pd.program_id = p.id
+       WHERE cw.id = $1 AND cw.user_id = $2`,
+      [workout_id, user_id]
+    );
+
+    if (workoutResult.rows.length === 0) {
+      return res.status(404).json({ error: 'Custom workout not found' });
+    }
+
+    // Get exercises with full details
+    const exercisesResult = await pool.query(
+      `SELECT cwe.*, e.name, e.muscle_group, e.description,
+        re.name as replaced_exercise_name,
+        re.muscle_group as replaced_exercise_muscle_group
+       FROM custom_workout_exercises cwe
+       JOIN exercises e ON cwe.exercise_id = e.id
+       LEFT JOIN exercises re ON cwe.replaced_exercise_id = re.id
+       WHERE cwe.custom_workout_id = $1
+       ORDER BY cwe.order_index`,
+      [workout_id]
+    );
+
+    res.json({
+      ...workoutResult.rows[0],
+      exercises: exercisesResult.rows
+    });
+  } catch (err) {
+    console.error('Error fetching custom workout:', err);
+    res.status(500).json({ error: 'Database error' });
+  }
+});
+
+// Update custom workout exercises (replace all)
+app.put('/api/custom-workouts/:id', authMiddleware, async (req, res) => {
+  const client = await pool.connect();
+  try {
+    const user_id = req.user.id;
+    const workout_id = req.params.id;
+    const { name, description, exercises } = req.body;
+
+    await client.query('BEGIN');
+
+    // Verify ownership
+    const workoutCheck = await client.query(
+      'SELECT id FROM custom_workouts WHERE id = $1 AND user_id = $2',
+      [workout_id, user_id]
+    );
+
+    if (workoutCheck.rows.length === 0) {
+      await client.query('ROLLBACK');
+      return res.status(404).json({ error: 'Custom workout not found' });
+    }
+
+    // Update workout details
+    if (name || description !== undefined) {
+      await client.query(
+        `UPDATE custom_workouts 
+         SET name = COALESCE($1, name), 
+             description = COALESCE($2, description),
+             updated_at = CURRENT_TIMESTAMP
+         WHERE id = $3`,
+        [name, description, workout_id]
+      );
+    }
+
+    // Replace exercises if provided
+    if (exercises && Array.isArray(exercises)) {
+      // Delete existing exercises
+      await client.query(
+        'DELETE FROM custom_workout_exercises WHERE custom_workout_id = $1',
+        [workout_id]
+      );
+
+      // Insert new exercises
+      for (let i = 0; i < exercises.length; i++) {
+        const ex = exercises[i];
+        await client.query(
+          `INSERT INTO custom_workout_exercises 
+           (custom_workout_id, exercise_id, sets, reps_min, reps_max, order_index, replaced_exercise_id)
+           VALUES ($1, $2, $3, $4, $5, $6, $7)`,
+          [workout_id, ex.exercise_id, ex.sets || 3, ex.reps_min || 8, ex.reps_max || 12, 
+           i, ex.replaced_exercise_id || null]
+        );
+      }
+    }
+
+    await client.query('COMMIT');
+
+    // Fetch and return updated workout
+    const updatedResult = await pool.query(
+      `SELECT cw.*, pd.name as original_day_name, p.name as program_name
+       FROM custom_workouts cw
+       LEFT JOIN program_days pd ON cw.source_program_day_id = pd.id
+       LEFT JOIN programs p ON pd.program_id = p.id
+       WHERE cw.id = $1`,
+      [workout_id]
+    );
+
+    const exercisesResult = await pool.query(
+      `SELECT cwe.*, e.name, e.muscle_group, e.description
+       FROM custom_workout_exercises cwe
+       JOIN exercises e ON cwe.exercise_id = e.id
+       WHERE cwe.custom_workout_id = $1
+       ORDER BY cwe.order_index`,
+      [workout_id]
+    );
+
+    res.json({
+      ...updatedResult.rows[0],
+      exercises: exercisesResult.rows
+    });
+  } catch (err) {
+    await client.query('ROLLBACK');
+    console.error('Error updating custom workout:', err);
+    res.status(500).json({ error: 'Database error' });
+  } finally {
+    client.release();
+  }
+});
+
+// Delete custom workout
+app.delete('/api/custom-workouts/:id', authMiddleware, async (req, res) => {
+  try {
+    const user_id = req.user.id;
+    const workout_id = req.params.id;
+
+    const result = await pool.query(
+      'DELETE FROM custom_workouts WHERE id = $1 AND user_id = $2 RETURNING id',
+      [workout_id, user_id]
+    );
+
+    if (result.rows.length === 0) {
+      return res.status(404).json({ error: 'Custom workout not found' });
+    }
+
+    res.json({ deleted: result.rows[0].id });
+  } catch (err) {
+    console.error('Error deleting custom workout:', err);
+    res.status(500).json({ error: 'Database error' });
+  }
+});
+
+// ============================================
+// Updated Log Endpoints (support source_type)
+// ============================================
+
+// Get workout logs (optionally filter by source_type and custom_workout_id)
+app.get('/api/logs', async (req, res) => {
+  try {
+    const { user_id, date, source_type, custom_workout_id } = req.query;
+    
+    let query = 'SELECT * FROM workout_logs WHERE user_id = $1';
+    let params = [user_id];
+    let paramIdx = 2;
+
+    if (date) {
+      query += ` AND date = $${paramIdx++}`;
+      params.push(date);
+    }
+
+    if (source_type) {
+      query += ` AND source_type = $${paramIdx++}`;
+      params.push(source_type);
+    }
+
+    if (custom_workout_id) {
+      query += ` AND custom_workout_id = $${paramIdx++}`;
+      params.push(custom_workout_id);
+    }
+
+    query += ' ORDER BY date DESC, set_number ASC';
+
+    const result = await pool.query(query, params);
+    res.json(result.rows);
+  } catch (err) {
+    console.error('Error fetching logs:', err);
+    res.status(500).json({ error: 'Database error' });
+  }
+});
+
+// Log a set (updated for source_type and custom_workout support)
+app.post('/api/logs', async (req, res) => {
+  try {
+    const { user_id, program_exercise_id, custom_workout_exercise_id, date, set_number, weight, reps, completed, source_type, custom_workout_id } = req.body;
+    
+    const source = source_type || 'program';
+    
+    // Determine which exercise identifier to use for lookup
+    const exerciseRef = custom_workout_exercise_id || program_exercise_id;
+    
+    // Check if log exists for this set
+    let existingQuery, existingParams;
+    if (source === 'custom' && custom_workout_id) {
+      existingQuery = `SELECT id FROM workout_logs 
+        WHERE user_id = $1 AND custom_workout_id = $2 AND date = $3 AND set_number = $4`;
+      existingParams = [user_id, custom_workout_id, date, set_number];
+    } else {
+      existingQuery = `SELECT id FROM workout_logs 
+        WHERE user_id = $1 AND program_exercise_id = $2 AND date = $3 AND set_number = $4`;
+      existingParams = [user_id, program_exercise_id, date, set_number];
+    }
+    
+    const existing = await pool.query(existingQuery, existingParams);
+    
+    let result;
+    if (existing.rows.length > 0) {
+      // Update existing
+      result = await pool.query(
+        `UPDATE workout_logs 
+         SET weight = $1, reps = $2, completed = $3, source_type = $4
+         WHERE id = $5 RETURNING *`,
+        [weight, reps, completed, source, existing.rows[0].id]
+      );
+    } else {
+      // Insert new
+      result = await pool.query(
+        `INSERT INTO workout_logs (user_id, program_exercise_id, custom_workout_exercise_id, 
+          date, set_number, weight, reps, completed, source_type, custom_workout_id) 
+         VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10) RETURNING *`,
+        [user_id, program_exercise_id, custom_workout_exercise_id, date, set_number, 
+         weight, reps, completed, source, custom_workout_id]
+      );
+    }
+    
+    res.json(result.rows[0]);
+  } catch (err) {
+    console.error('Error logging set:', err);
+    res.status(500).json({ error: 'Database error' });
+  }
+});
+
+// Delete a specific set log (updated for source_type support)
+app.delete('/api/logs', async (req, res) => {
+  try {
+    const { user_id, program_exercise_id, custom_workout_id, date, set_number } = req.body;
+
+    let query, params;
+    if (custom_workout_id) {
+      query = `DELETE FROM workout_logs 
+        WHERE user_id = $1 AND custom_workout_id = $2 AND date = $3 AND set_number = $4 
+        RETURNING id`;
+      params = [user_id, custom_workout_id, date, set_number];
+    } else {
+      query = `DELETE FROM workout_logs 
+        WHERE user_id = $1 AND program_exercise_id = $2 AND date = $3 AND set_number = $4 
+        RETURNING id`;
+      params = [user_id, program_exercise_id, date, set_number];
+    }
+
+    const result = await pool.query(query, params);
+
+    if (result.rows.length === 0) {
+      return res.status(404).json({ error: 'Log not found' });
+    }
+
+    res.json({ deleted: result.rows[0].id });
+  } catch (err) {
+    console.error('Error deleting log:', err);
+    res.status(500).json({ error: 'Database error' });
+  }
+});
+

db/init.sql

@@ -179,3 +179,38 @@ INSERT INTO program_exercises (program_day_id, exercise_id, sets, reps_min, reps
 (6, 16, 4, 10, 12, 4), -- Leg Curls 4x10-12
 (6, 17, 4, 12, 15, 5)  -- Calf Raises 4x12-15
 ON CONFLICT DO NOTHING;
+
+-- Custom workouts created by users
+CREATE TABLE IF NOT EXISTS custom_workouts (
+    id SERIAL PRIMARY KEY,
+    user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    name VARCHAR(255) NOT NULL,
+    description TEXT,
+    source_program_day_id INTEGER REFERENCES program_days(id) ON DELETE SET NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+-- Exercises within a custom workout
+CREATE TABLE IF NOT EXISTS custom_workout_exercises (
+    id SERIAL PRIMARY KEY,
+    custom_workout_id INTEGER NOT NULL REFERENCES custom_workouts(id) ON DELETE CASCADE,
+    exercise_id INTEGER NOT NULL REFERENCES exercises(id) ON DELETE CASCADE,
+    sets INTEGER NOT NULL DEFAULT 3,
+    reps_min INTEGER NOT NULL DEFAULT 8,
+    reps_max INTEGER NOT NULL DEFAULT 12,
+    rpe_target DECIMAL(3,1),
+    replaced_exercise_id INTEGER REFERENCES exercises(id) ON DELETE SET NULL,
+    order_index INTEGER NOT NULL DEFAULT 0,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+-- Extend workout_logs to support custom workouts
+ALTER TABLE workout_logs
+    ADD COLUMN IF NOT EXISTS source_type VARCHAR(20) DEFAULT 'program' CHECK (source_type IN ('program', 'custom')),
+    ADD COLUMN IF NOT EXISTS custom_workout_id INTEGER REFERENCES custom_workouts(id) ON DELETE SET NULL;
+
+-- Indexes for custom workout tables
+CREATE INDEX IF NOT EXISTS idx_custom_workouts_user ON custom_workouts(user_id);
+CREATE INDEX IF NOT EXISTS idx_custom_workout_exercises_workout ON custom_workout_exercises(custom_workout_id);
+CREATE INDEX IF NOT EXISTS idx_workout_logs_custom_workout ON workout_logs(custom_workout_id);

db/migrations/004_add_custom_workouts.sql

@@ -0,0 +1,37 @@
+-- Migration 004: Add custom workout support
+-- Allows users to create personalized workout plans based on program days
+
+-- Custom workouts created by users
+CREATE TABLE IF NOT EXISTS custom_workouts (
+    id SERIAL PRIMARY KEY,
+    user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
+    name VARCHAR(255) NOT NULL,
+    description TEXT,
+    source_program_day_id INTEGER REFERENCES program_days(id) ON DELETE SET NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    updated_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+-- Exercises within a custom workout
+CREATE TABLE IF NOT EXISTS custom_workout_exercises (
+    id SERIAL PRIMARY KEY,
+    custom_workout_id INTEGER NOT NULL REFERENCES custom_workouts(id) ON DELETE CASCADE,
+    exercise_id INTEGER NOT NULL REFERENCES exercises(id) ON DELETE CASCADE,
+    sets INTEGER NOT NULL DEFAULT 3,
+    reps_min INTEGER NOT NULL DEFAULT 8,
+    reps_max INTEGER NOT NULL DEFAULT 12,
+    rpe_target DECIMAL(3,1),
+    replaced_exercise_id INTEGER REFERENCES exercises(id) ON DELETE SET NULL,
+    order_index INTEGER NOT NULL DEFAULT 0,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+);
+
+-- Extend workout_logs to support custom workouts
+ALTER TABLE workout_logs
+    ADD COLUMN IF NOT EXISTS source_type VARCHAR(20) DEFAULT 'program' CHECK (source_type IN ('program', 'custom')),
+    ADD COLUMN IF NOT EXISTS custom_workout_id INTEGER REFERENCES custom_workouts(id) ON DELETE SET NULL;
+
+-- Indexes
+CREATE INDEX IF NOT EXISTS idx_custom_workouts_user ON custom_workouts(user_id);
+CREATE INDEX IF NOT EXISTS idx_custom_workout_exercises_workout ON custom_workout_exercises(custom_workout_id);
+CREATE INDEX IF NOT EXISTS idx_workout_logs_custom_workout ON workout_logs(custom_workout_id);

docker-compose.staging.yml

@@ -0,0 +1,21 @@
+version: "3.8"
+services:
+  gravl-frontend:
+    container_name: staging-gravl-frontend-PLACEHOLDER
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.staging-gravl-PLACEHOLDER.rule=Host(`PLACEHOLDER.gravl.homelab.local`)
+      - traefik.http.routers.staging-gravl-PLACEHOLDER.entrypoints=websecure
+      - traefik.http.routers.staging-gravl-PLACEHOLDER.tls=true
+      - traefik.http.routers.staging-gravl-PLACEHOLDER.service=staging-gravl-PLACEHOLDER
+      - traefik.http.services.staging-gravl-PLACEHOLDER.loadbalancer.server.port=80
+
+  gravl-backend:
+    container_name: staging-gravl-backend-PLACEHOLDER
+    labels:
+      - traefik.enable=true
+      - traefik.http.routers.staging-gravl-PLACEHOLDER-api.rule=Host(`PLACEHOLDER.api.gravl.homelab.local`)
+      - traefik.http.routers.staging-gravl-PLACEHOLDER-api.entrypoints=websecure
+      - traefik.http.routers.staging-gravl-PLACEHOLDER-api.tls=true
+      - traefik.http.routers.staging-gravl-PLACEHOLDER-api.service=staging-gravl-PLACEHOLDER-api
+      - traefik.http.services.staging-gravl-PLACEHOLDER-api.loadbalancer.server.port=3001

docs/CODING-CONVENTIONS.md

@@ -1,103 +0,0 @@
-# Gravl Coding Conventions
-
-## Utvecklingsmetodik
-
-### Red/Green TDD (OBLIGATORISKT)
-
-All ny kod måste följa TDD-cykeln:
-
-```
-🔴 RED → 🟢 GREEN → 🔄 REFACTOR
-```
-
-#### 1. 🔴 RED - Skriv test först
-```javascript
-// test/feature.test.js
-describe('Feature', () => {
-  it('should do expected behavior', async () => {
-    const result = await feature.doSomething();
-    expect(result).toBe(expected);
-  });
-});
-```
-
-**Kör testet - det MÅSTE faila!**
-```bash
-npm test -- --grep "Feature"
-# ❌ FAIL (detta är rätt!)
-```
-
-#### 2. 🟢 GREEN - Minimal implementation
-Skriv bara tillräckligt med kod för att testet passerar:
-```javascript
-// src/feature.js
-export function doSomething() {
-  return expected; // Minimal lösning
-}
-```
-
-**Kör testet igen:**
-```bash
-npm test -- --grep "Feature"
-# ✅ PASS
-```
-
-#### 3. 🔄 REFACTOR - Förbättra
-Nu kan du:
-- Refaktorera för clean code
-- Extrahera funktioner
-- Förbättra namngivning
-- Ta bort duplicering
-
-**Kör testerna kontinuerligt:**
-```bash
-npm test
-# ✅ Alla test måste fortfarande passa
-```
-
----
-
-## Teststruktur
-
-```
-/workspace/gravl/
-├── src/
-│   └── components/
-├── server/
-│   └── routes/
-└── test/
-    ├── unit/           # Enhetstester
-    ├── integration/    # API-tester
-    └── e2e/            # End-to-end
-```
-
-## Namnkonventioner
-
-### Tester
-- `[feature].test.js` - Unit tests
-- `[feature].integration.test.js` - Integration tests
-- Describe-block: Noun (vad testas)
-- It-block: "should [verb] [expected outcome]"
-
-### Commits
-```
-test: add failing test for [feature]
-feat: implement [feature] to pass tests
-refactor: clean up [feature] implementation
-```
-
----
-
-## Workflow för kodningsagenter
-
-1. **Få uppgift** från Gravl PM
-2. **Läs spec** i docs/current-task.md
-3. **Skriv failing test** - visa PM
-4. **Implementera** tills test passerar
-5. **Refaktorera** om nödvändigt
-6. **Commit** med rätt prefix
-7. **Rapportera** till PM
-
----
-
-*Uppdaterad: 2026-02-28*

frontend/dist/index.html

@@ -11,8 +11,8 @@
     <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
     <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet">
     <title>Gravl - Träning</title>
-    <script type="module" crossorigin src="/assets/index-hhKetRGz.js"></script>
+    <script type="module" crossorigin src="/assets/index-DIGPkDnZ.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-my_lGtI5.css">
+    <link rel="stylesheet" crossorigin href="/assets/index-D0xrERyI.css">
   </head>
   <body>
     <div id="root"></div>

frontend/package-lock.json

@@ -13,6 +13,7 @@
         "react-router-dom": "^6.21.0"
       },
       "devDependencies": {
+        "@playwright/test": "^1.58.2",
         "@types/react": "^18.2.43",
         "@types/react-dom": "^18.2.17",
         "@vitejs/plugin-react": "^4.2.1",
@@ -742,6 +743,22 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@playwright/test": {
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.58.2.tgz",
+      "integrity": "sha512-akea+6bHYBBfA9uQqSYmlJXn61cTa+jbO87xVLCWbTqbWadRVmhxlXATaOjOgcBaWU4ePo0wB41KMFv3o35IXA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright": "1.58.2"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@remix-run/router": {
       "version": "1.23.2",
       "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.2.tgz",
@@ -1481,6 +1498,53 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/playwright": {
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.58.2.tgz",
+      "integrity": "sha512-vA30H8Nvkq/cPBnNw4Q8TWz1EJyqgpuinBcHET0YVJVFldr8JDNiU9LaWAE1KqSkRYazuaBhTpB5ZzShOezQ6A==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "playwright-core": "1.58.2"
+      },
+      "bin": {
+        "playwright": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "optionalDependencies": {
+        "fsevents": "2.3.2"
+      }
+    },
+    "node_modules/playwright-core": {
+      "version": "1.58.2",
+      "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.58.2.tgz",
+      "integrity": "sha512-yZkEtftgwS8CsfYo7nm0KE8jsvm6i/PTgVtB8DL726wNf6H2IMsDuxCpJj59KDaxCtSnrWan2AeDqM7JBaultg==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "playwright-core": "cli.js"
+      },
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/playwright/node_modules/fsevents": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
+      "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
     "node_modules/postcss": {
       "version": "8.5.6",
       "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",

frontend/package.json

@@ -14,6 +14,7 @@
     "react-router-dom": "^6.21.0"
   },
   "devDependencies": {
+    "@playwright/test": "^1.58.2",
     "@types/react": "^18.2.43",
     "@types/react-dom": "^18.2.17",
     "@vitejs/plugin-react": "^4.2.1",

frontend/playwright.config.js

@@ -0,0 +1,12 @@
+module.exports = {
+  testDir: "./tests",
+  use: {
+    baseURL: process.env.STAGING_URL || "https://gravl.homelab.local",
+    headless: true,
+    screenshot: "only-on-failure",
+  },
+  projects: [{
+    name: "chromium",
+    use: { browserName: "chromium" }
+  }]
+};

frontend/src/App.css

@@ -2958,3 +2958,213 @@
   border: 2px solid var(--border); display: flex; align-items: center; justify-content: center;
 }
 .warmup-item.done .warmup-check { background: var(--success); border-color: var(--success); color: white; }
+
+/* Workout badge styling */
+.workout-badge-container {
+  position: relative;
+  display: flex;
+  align-items: flex-end;
+}
+
+.workout-badge {
+  position: absolute;
+  bottom: -6px;
+  right: -6px;
+  font-size: var(--font-xs);
+  font-weight: 600;
+  padding: var(--space-1) var(--space-2);
+  border-radius: var(--radius-sm);
+  border: 1px solid transparent;
+  text-transform: uppercase;
+  letter-spacing: 0.5px;
+  box-shadow: 0 1px 4px rgba(0, 0, 0, 0.15);
+  white-space: nowrap;
+  color: white;
+}
+
+.workout-badge.custom {
+  background: var(--accent);
+  color: white;
+  border-color: var(--accent);
+}
+
+.workout-badge.program {
+  background: var(--text-muted);
+  color: white;
+  border-color: var(--text-muted);
+  opacity: 0.7;
+}
+
+.workout-select-card:hover .workout-badge {
+  box-shadow: 0 2px 6px rgba(0, 0, 0, 0.25);
+}
+
+/* Reset button for custom workouts */
+.reset-btn {
+  position: absolute;
+  top: -8px;
+  right: -8px;
+  width: 32px;
+  height: 32px;
+  border-radius: var(--radius-full);
+  background: var(--accent);
+  border: 2px solid var(--bg-primary);
+  color: white;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  transition: all 0.2s ease;
+  box-shadow: 0 2px 8px rgba(255, 107, 74, 0.3);
+  padding: 0;
+  min-width: 32px;
+  min-height: 32px;
+}
+
+.reset-btn:hover {
+  background: #e85a3c;
+  transform: scale(1.1);
+  box-shadow: 0 4px 12px rgba(255, 107, 74, 0.4);
+}
+
+.reset-btn:active {
+  transform: scale(0.95);
+}
+
+/* Success message */
+.success-message {
+  display: flex;
+  align-items: center;
+  gap: var(--space-2);
+  padding: var(--space-3) var(--space-4);
+  background: linear-gradient(135deg, var(--success), #16a34a);
+  color: white;
+  border-radius: var(--radius-lg);
+  margin-bottom: var(--space-4);
+  animation: slideDown 0.3s ease;
+  box-shadow: 0 4px 12px rgba(34, 197, 94, 0.2);
+}
+
+@keyframes slideDown {
+  from {
+    opacity: 0;
+    transform: translateY(-10px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+/* Modal dialog styles */
+.modal-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1000;
+  animation: fadeIn 0.2s ease;
+}
+
+@keyframes fadeIn {
+  from { opacity: 0; }
+  to { opacity: 1; }
+}
+
+.modal-dialog {
+  background: var(--bg-primary);
+  border-radius: var(--radius-xl);
+  box-shadow: 0 10px 40px rgba(0, 0, 0, 0.3);
+  max-width: 400px;
+  width: 90%;
+  animation: slideUp 0.3s ease;
+  overflow: hidden;
+}
+
+@keyframes slideUp {
+  from {
+    opacity: 0;
+    transform: translateY(20px);
+  }
+  to {
+    opacity: 1;
+    transform: translateY(0);
+  }
+}
+
+.modal-header {
+  padding: var(--space-4);
+  border-bottom: 1px solid var(--border);
+}
+
+.modal-header h2 {
+  font-size: var(--font-lg);
+  font-weight: 700;
+  margin: 0;
+  color: var(--text-primary);
+}
+
+.modal-body {
+  padding: var(--space-4);
+}
+
+.modal-body p {
+  font-size: var(--font-md);
+  color: var(--text-secondary);
+  line-height: 1.5;
+  margin: 0;
+}
+
+.modal-footer {
+  padding: var(--space-4);
+  border-top: 1px solid var(--border);
+  display: flex;
+  gap: var(--space-2);
+  justify-content: flex-end;
+}
+
+.modal-btn {
+  padding: var(--space-2) var(--space-4);
+  border-radius: var(--radius-md);
+  border: none;
+  cursor: pointer;
+  font-size: var(--font-md);
+  font-weight: 600;
+  transition: all 0.2s ease;
+  min-height: 40px;
+}
+
+.modal-btn:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+}
+
+.modal-btn.cancel {
+  background: var(--bg-secondary);
+  color: var(--text-primary);
+  border: 1px solid var(--border);
+}
+
+.modal-btn.cancel:hover:not(:disabled) {
+  background: var(--bg-tertiary);
+  border-color: var(--border);
+}
+
+.modal-btn.confirm {
+  background: var(--accent);
+  color: white;
+}
+
+.modal-btn.confirm:hover:not(:disabled) {
+  background: #e85a3c;
+  box-shadow: 0 4px 12px rgba(255, 107, 74, 0.3);
+}
+
+.modal-btn.confirm:active:not(:disabled) {
+  transform: scale(0.98);
+}

frontend/src/components/ExercisePicker.jsx

@@ -0,0 +1,112 @@
+import { useState, useEffect, useMemo } from 'react'
+import { Icon } from './Icons'
+
+const API_URL = '/api'
+
+function ExercisePicker({ open, onSelect, onClose, excludeIds = [] }) {
+  const [exercises, setExercises] = useState([])
+  const [loading, setLoading] = useState(false)
+  const [search, setSearch] = useState('')
+  const [activeGroup, setActiveGroup] = useState('Alla')
+
+  useEffect(() => {
+    if (open) {
+      fetchExercises()
+      setSearch('')
+      setActiveGroup('Alla')
+    }
+  }, [open])
+
+  const fetchExercises = async () => {
+    setLoading(true)
+    try {
+      const res = await fetch(`${API_URL}/exercises`)
+      if (!res.ok) throw new Error('Failed to fetch')
+      const data = await res.json()
+      setExercises(data)
+    } catch (err) {
+      console.error('Failed to fetch exercises:', err)
+    } finally {
+      setLoading(false)
+    }
+  }
+
+  const muscleGroups = useMemo(() => {
+    const groups = new Set(exercises.map(e => e.muscle_group).filter(Boolean))
+    return ['Alla', ...Array.from(groups).sort()]
+  }, [exercises])
+
+  const filtered = useMemo(() => {
+    return exercises.filter(ex => {
+      if (excludeIds.includes(ex.id)) return false
+      if (activeGroup !== 'Alla' && ex.muscle_group !== activeGroup) return false
+      if (search) {
+        const q = search.toLowerCase()
+        return ex.name.toLowerCase().includes(q) ||
+               (ex.muscle_group || '').toLowerCase().includes(q)
+      }
+      return true
+    })
+  }, [exercises, search, activeGroup, excludeIds])
+
+  if (!open) return null
+
+  return (
+    <div className="exercise-picker-overlay" onClick={onClose}>
+      <div className="exercise-picker" onClick={e => e.stopPropagation()}>
+        <div className="exercise-picker-header">
+          <h2>Välj övning</h2>
+          <button className="exercise-picker-close" onClick={onClose} aria-label="Stäng">
+            <Icon name="chevronDown" size={20} />
+          </button>
+        </div>
+
+        <div className="exercise-picker-search">
+          <input
+            type="text"
+            placeholder="Sök övning..."
+            value={search}
+            onChange={e => setSearch(e.target.value)}
+            autoFocus
+          />
+        </div>
+
+        <div className="exercise-picker-filters">
+          {muscleGroups.map(group => (
+            <button
+              key={group}
+              className={`filter-chip ${activeGroup === group ? 'active' : ''}`}
+              onClick={() => setActiveGroup(group)}
+            >
+              {group}
+            </button>
+          ))}
+        </div>
+
+        <div className="exercise-picker-list">
+          {loading && <div className="exercise-picker-state">Laddar övningar...</div>}
+
+          {!loading && filtered.length === 0 && (
+            <div className="exercise-picker-state">Inga övningar hittades.</div>
+          )}
+
+          {!loading && filtered.map(ex => (
+            <button
+              key={ex.id}
+              className="exercise-picker-item"
+              onClick={() => onSelect(ex)}
+            >
+              <div className="exercise-picker-item-info">
+                <strong>{ex.name}</strong>
+                <span className="exercise-picker-item-group">{ex.muscle_group}</span>
+              </div>
+              <Icon name="arrowLeft" size={16} style={{ transform: 'rotate(180deg)', opacity: 0.4 }} />
+            </button>
+          ))}
+        </div>
+      </div>
+    </div>
+  )
+}
+
+export default ExercisePicker

frontend/src/components/Icons.jsx

@@ -234,6 +234,24 @@ export const Icons = {
       <path d="M9 6V4a1 1 0 0 1 1-1h4a1 1 0 0 1 1 1v2"/>
     </svg>
   ),
+  edit: (
+    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+      <path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"/>
+      <path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"/>
+    </svg>
+  ),
+  search: (
+    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+      <circle cx="11" cy="11" r="8"/>
+      <line x1="21" y1="21" x2="16.65" y2="16.65"/>
+    </svg>
+  ),
+  x: (
+    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+      <line x1="18" y1="6" x2="6" y2="18"/>
+      <line x1="6" y1="6" x2="18" y2="18"/>
+    </svg>
+  ),
 
   // Brand
   gravl: (
@@ -243,6 +261,30 @@ export const Icons = {
       <line x1="8" y1="8" x2="16" y2="16"/>
     </svg>
   ),
+  refresh: (
+    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+      <path d="M1 4v6h6M23 20v-6h-6"/>
+      <path d="M20.49 9A9 9 0 0 0 5.64 5.64L1 10m22 4l-4.64 4.36A9 9 0 0 1 3.51 15"/>
+    </svg>
+  ),
+  spinner: (
+    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+      <circle cx="12" cy="12" r="10"/>
+      <path d="M12 2a10 10 0 0 1 10 10" opacity="0.3"/>
+    </svg>
+  ),
+  alert: (
+    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">
+      <path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3.05h16.94a2 2 0 0 0 1.71-3.05L13.71 3.86a2 2 0 0 0-3.42 0z"/>
+      <line x1="12" y1="9" x2="12" y2="13"/>
+      <line x1="12" y1="17" x2="12.01" y2="17"/>
+    </svg>
+  ),
+  checkmark: (
+    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round" strokeLinejoin="round">
+      <polyline points="20 6 9 17 4 12"/>
+    </svg>
+  ),
 }
 
 // Icon component wrapper

frontend/src/components/Icons_new.jsx

@@ -0,0 +1,19 @@
+$(cat Icons.jsx | sed '/^  refresh: (/,/^  ),$/a\
+\  spinner: (\
+\    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">\
+\      <circle cx="12" cy="12" r="10"/>\
+\      <path d="M12 2a10 10 0 0 1 10 10" opacity="0.3"/>\
+\    </svg>\
+\  ),\
+\  alert: (\
+\    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2" strokeLinecap="round" strokeLinejoin="round">\
+\      <path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3.05h16.94a2 2 0 0 0 1.71-3.05L13.71 3.86a2 2 0 0 0-3.42 0z"/>\
+\      <line x1="12" y1="9" x2="12" y2="13"/>\
+\      <line x1="12" y1="17" x2="12.01" y2="17"/>\
+\    </svg>\
+\  ),\
+\  checkmark: (\
+\    <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" strokeWidth="2.5" strokeLinecap="round" strokeLinejoin="round">\
+\      <polyline points="20 6 9 17 4 12"/>\
+\    </svg>\
+\  ),')</EOFTEMP

frontend/src/hooks/useDraftWorkout.js

@@ -0,0 +1,65 @@
+import { useEffect, useState } from 'react'
+
+/**
+ * useDraftWorkout - Manages draft workout state with localStorage persistence
+ * 
+ * @param {number} workoutId - Unique workout ID (used as localStorage key)
+ * @param {array} initialExercises - Initial exercise list
+ * @returns {object} { exercises, setExercises, clearDraft, hasDraft, restoreDraft }
+ */
+export function useDraftWorkout(workoutId, initialExercises = []) {
+  const [exercises, setExercises] = useState(initialExercises)
+  const [hasDraft, setHasDraft] = useState(false)
+
+  const draftKey = `workout-draft-${workoutId}`
+
+  // Load draft from localStorage on mount
+  useEffect(() => {
+    const saved = localStorage.getItem(draftKey)
+    if (saved) {
+      try {
+        const draft = JSON.parse(saved)
+        setExercises(draft)
+        setHasDraft(true)
+      } catch (err) {
+        console.error('Failed to parse draft:', err)
+        localStorage.removeItem(draftKey) // Clear corrupted draft
+      }
+    }
+  }, [workoutId, draftKey])
+
+  // Auto-save to localStorage whenever exercises change
+  useEffect(() => {
+    if (exercises.length > 0) {
+      localStorage.setItem(draftKey, JSON.stringify(exercises))
+    }
+  }, [exercises, draftKey])
+
+  const clearDraft = () => {
+    localStorage.removeItem(draftKey)
+    setHasDraft(false)
+  }
+
+  const restoreDraft = () => {
+    const saved = localStorage.getItem(draftKey)
+    if (saved) {
+      try {
+        const draft = JSON.parse(saved)
+        setExercises(draft)
+        return true
+      } catch (err) {
+        console.error('Failed to restore draft:', err)
+        return false
+      }
+    }
+    return false
+  }
+
+  return {
+    exercises,
+    setExercises,
+    clearDraft,
+    hasDraft,
+    restoreDraft
+  }
+}

frontend/src/index.js

@@ -0,0 +1,30 @@
+import React from 'react'
+import { createRoot } from 'react-dom/client'
+import './styles/App.css'
+import WorkoutPage from './pages/WorkoutPage'
+
+const App = () => {
+  // Minimal placeholder data to mount the page standalone
+  const day = {
+    name: 'Push A',
+    day_number: 1,
+    exercises: [
+      { id: 1, name: 'Bench Press', muscle_group: 'Bröst', sets: 3, reps_min: 8, reps_max: 12 },
+      { id: 2, name: 'Overhead Press', muscle_group: 'Axlar', sets: 3, reps_min: 8, reps_max: 12 }
+    ]
+  }
+  const week = 1
+  const logs = {}
+  const onBack = () => { console.log('Back') }
+  const fetchProgression = async (id) => ({ suggestedWeight: 20 })
+  const onLogSet = () => {}
+  const onDeleteSet = () => {}
+  return (
+    <div className="app">
+      <WorkoutPage day={day} week={week} logs={logs} onBack={onBack} fetchProgression={fetchProgression} onLogSet={onLogSet} onDeleteSet={onDeleteSet} />
+    </div>
+  )
+}
+
+const root = createRoot(document.getElementById('root'))
+root.render(<App />)

frontend/src/pages/WorkoutEditPage.css

@@ -0,0 +1,578 @@
+.edit-page {
+  display: flex;
+  flex-direction: column;
+  height: 100vh;
+  background: #f5f5f5;
+}
+
+.page-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 1rem;
+  background: white;
+  border-bottom: 1px solid #ddd;
+  gap: 1rem;
+}
+
+.page-header h1 {
+  flex: 1;
+  text-align: center;
+  font-size: 1.25rem;
+  margin: 0;
+  color: #333;
+}
+
+.back-btn,
+.save-header-btn {
+  padding: 0.5rem 1rem;
+  border: none;
+  border-radius: 0.25rem;
+  cursor: pointer;
+  font-size: 0.9rem;
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+  min-height: 44px;
+  min-width: 44px;
+}
+
+.back-btn {
+  background: #f0f0f0;
+  color: #333;
+}
+
+.back-btn:hover:not(:disabled) {
+  background: #e0e0e0;
+}
+
+.back-btn:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.save-header-group {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.sync-status {
+  padding: 0.5rem 0.75rem;
+  border-radius: 0.25rem;
+  font-size: 0.85rem;
+  display: flex;
+  align-items: center;
+  gap: 0.4rem;
+  white-space: nowrap;
+}
+
+.sync-status.saved {
+  background: #d4edda;
+  color: #155724;
+}
+
+.sync-status.error {
+  background: #f8d7da;
+  color: #721c24;
+}
+
+.save-header-btn {
+  background: #007bff;
+  color: white;
+  padding: 0.5rem 1.25rem;
+}
+
+.save-header-btn:hover:not(:disabled) {
+  background: #0056b3;
+}
+
+.save-header-btn:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+/* Draft Recovery Prompt */
+.draft-prompt-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background: rgba(0, 0, 0, 0.5);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1000;
+}
+
+.draft-prompt-modal {
+  background: white;
+  border-radius: 0.5rem;
+  padding: 2rem;
+  max-width: 400px;
+  width: 90%;
+  box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+}
+
+.draft-prompt-modal h2 {
+  margin-top: 0;
+  margin-bottom: 0.5rem;
+  color: #333;
+  font-size: 1.25rem;
+}
+
+.draft-prompt-modal p {
+  color: #666;
+  margin-bottom: 1.5rem;
+  line-height: 1.5;
+}
+
+.draft-prompt-actions {
+  display: flex;
+  gap: 1rem;
+  justify-content: flex-end;
+}
+
+.btn {
+  padding: 0.75rem 1.5rem;
+  border: none;
+  border-radius: 0.25rem;
+  cursor: pointer;
+  font-size: 0.95rem;
+  font-weight: 500;
+  min-height: 44px;
+  transition: all 0.2s;
+}
+
+.btn-primary {
+  background: #007bff;
+  color: white;
+}
+
+.btn-primary:hover {
+  background: #0056b3;
+}
+
+.btn-secondary {
+  background: #e9ecef;
+  color: #333;
+}
+
+.btn-secondary:hover {
+  background: #dee2e6;
+}
+
+/* Error Banner */
+.error-banner {
+  background: #f8d7da;
+  border-bottom: 1px solid #f5c6cb;
+  padding: 1rem;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  gap: 1rem;
+  color: #721c24;
+  animation: slideDown 0.3s ease-out;
+}
+
+@keyframes slideDown {
+  from {
+    transform: translateY(-100%);
+    opacity: 0;
+  }
+  to {
+    transform: translateY(0);
+    opacity: 1;
+  }
+}
+
+.error-message {
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  flex: 1;
+}
+
+.error-actions {
+  display: flex;
+  align-items: center;
+  gap: 0.5rem;
+}
+
+.btn-retry {
+  padding: 0.5rem 1rem;
+  background: #721c24;
+  color: white;
+  border: none;
+  border-radius: 0.25rem;
+  cursor: pointer;
+  font-size: 0.85rem;
+  min-height: 40px;
+  transition: background 0.2s;
+}
+
+.btn-retry:hover {
+  background: #5a1520;
+}
+
+.btn-close {
+  background: transparent;
+  border: none;
+  color: #721c24;
+  font-size: 1.5rem;
+  cursor: pointer;
+  padding: 0;
+  width: 32px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.btn-close:hover {
+  opacity: 0.7;
+}
+
+/* Main Content */
+.edit-main {
+  flex: 1;
+  overflow-y: auto;
+  padding: 1rem;
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+}
+
+.workout-meta-card {
+  background: white;
+  padding: 1rem;
+  border-radius: 0.5rem;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.workout-meta-card h2 {
+  margin: 0 0 0.5rem 0;
+  font-size: 1.25rem;
+  color: #333;
+}
+
+.workout-meta-card p {
+  margin: 0;
+  color: #666;
+  font-size: 0.9rem;
+}
+
+.edit-exercises-list {
+  display: flex;
+  flex-direction: column;
+  gap: 1rem;
+  flex: 1;
+}
+
+.edit-exercise-card {
+  background: white;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
+}
+
+.edit-card-header {
+  display: flex;
+  justify-content: space-between;
+  align-items: flex-start;
+  margin-bottom: 1rem;
+  gap: 1rem;
+}
+
+.edit-card-info h3 {
+  margin: 0 0 0.5rem 0;
+  color: #333;
+  font-size: 1.05rem;
+}
+
+.muscle-group {
+  display: inline-block;
+  background: #f0f0f0;
+  padding: 0.25rem 0.5rem;
+  border-radius: 0.25rem;
+  font-size: 0.8rem;
+  color: #666;
+}
+
+.edit-card-actions {
+  display: flex;
+  gap: 0.5rem;
+}
+
+.icon-btn {
+  padding: 0.5rem;
+  border: none;
+  background: #f0f0f0;
+  color: #333;
+  cursor: pointer;
+  border-radius: 0.25rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  min-height: 40px;
+  min-width: 40px;
+  transition: all 0.2s;
+}
+
+.icon-btn:hover:not(:disabled) {
+  background: #e0e0e0;
+}
+
+.icon-btn:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+.icon-btn.delete {
+  color: #dc3545;
+}
+
+.icon-btn.delete:hover:not(:disabled) {
+  background: #ffe0e0;
+}
+
+.edit-card-settings {
+  display: grid;
+  grid-template-columns: repeat(auto-fit, minmax(100px, 1fr));
+  gap: 1rem;
+}
+
+.setting-group {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+}
+
+.setting-group label {
+  font-size: 0.85rem;
+  color: #666;
+  font-weight: 500;
+}
+
+.setting-group input {
+  padding: 0.5rem;
+  border: 1px solid #ddd;
+  border-radius: 0.25rem;
+  font-size: 1rem;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, sans-serif;
+  min-height: 40px;
+}
+
+.setting-group input:focus {
+  outline: none;
+  border-color: #007bff;
+  box-shadow: 0 0 0 3px rgba(0, 123, 255, 0.25);
+}
+
+.setting-group input:disabled {
+  background: #f5f5f5;
+  color: #999;
+  cursor: not-allowed;
+}
+
+.add-exercise-btn {
+  padding: 1rem;
+  background: #28a745;
+  color: white;
+  border: none;
+  border-radius: 0.5rem;
+  cursor: pointer;
+  font-size: 1rem;
+  font-weight: 500;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  gap: 0.5rem;
+  min-height: 50px;
+  transition: background 0.2s;
+  align-self: center;
+  max-width: 300px;
+  width: 100%;
+}
+
+.add-exercise-btn:hover:not(:disabled) {
+  background: #218838;
+}
+
+.add-exercise-btn:disabled {
+  opacity: 0.5;
+  cursor: not-allowed;
+}
+
+
+/* Sync Status Indicator - Saving State */
+.sync-status.saving {
+  background: #cfe8fc;
+  color: #004085;
+  animation: pulse 1s ease-in-out infinite;
+}
+
+@keyframes pulse {
+  0%, 100% {
+    opacity: 1;
+  }
+  50% {
+    opacity: 0.7;
+  }
+}
+
+/* Spinner animation for saving state */
+.icon-spinner {
+  animation: spin 1s linear infinite;
+}
+
+/* Save Timeout Warning Banner */
+.timeout-banner {
+  background: #fff3cd;
+  border-bottom: 1px solid #ffeaa7;
+  padding: 1rem;
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  color: #856404;
+  font-size: 0.95rem;
+  animation: slideDown 0.3s ease-out;
+}
+
+/* Toast Notification Container */
+.toast {
+  position: fixed;
+  bottom: 1rem;
+  left: 50%;
+  transform: translateX(-50%);
+  padding: 1rem 1.5rem;
+  border-radius: 0.5rem;
+  display: flex;
+  align-items: center;
+  gap: 0.75rem;
+  font-weight: 500;
+  z-index: 2000;
+  animation: slideUp 0.3s ease-out;
+  box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15);
+  max-width: 90vw;
+  word-break: break-word;
+}
+
+.toast-success {
+  background: #d4edda;
+  color: #155724;
+}
+
+.toast-error {
+  background: #f8d7da;
+  color: #721c24;
+}
+
+@keyframes slideUp {
+  from {
+    transform: translateX(-50%) translateY(100%);
+    opacity: 0;
+  }
+  to {
+    transform: translateX(-50%) translateY(0);
+    opacity: 1;
+  }
+}
+
+/* Mobile adjustments for toast */
+@media (max-width: 600px) {
+  .toast {
+    bottom: 2rem;
+    left: 1rem;
+    right: 1rem;
+    transform: none;
+    max-width: none;
+  }
+  
+  .timeout-banner {
+    font-size: 0.9rem;
+    padding: 0.75rem;
+  }
+}
+
+
+/* Mobile/Tablet Adjustments */
+@media (max-width: 600px) {
+  .page-header {
+    padding: 0.75rem;
+  }
+
+  .page-header h1 {
+    font-size: 1rem;
+  }
+
+  .back-btn,
+  .save-header-btn {
+    padding: 0.5rem 0.75rem;
+    font-size: 0.85rem;
+  }
+
+  .edit-main {
+    padding: 0.75rem;
+  }
+
+  .edit-card-settings {
+    grid-template-columns: 1fr;
+  }
+
+  .draft-prompt-modal {
+    padding: 1.5rem;
+    max-width: 90%;
+  }
+}
+
+/* Spinner Animation for Save Loading */
+@keyframes spin {
+  from {
+    transform: rotate(0deg);
+  }
+  to {
+    transform: rotate(360deg);
+  }
+}
+
+/* Apply spinner animation to Icon component with spinner class */
+.save-header-btn svg[class*="spinner"],
+.save-header-btn .icon-spinner {
+  animation: spin 1s linear infinite;
+}
+
+/* Success Checkmark Animation */
+@keyframes slideInCheckmark {
+  0% {
+    opacity: 0;
+    transform: scale(0.8);
+  }
+  100% {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
+.sync-status.saved {
+  animation: slideInCheckmark 0.3s ease-out;
+}
+
+/* Ensure error actions align properly on mobile */
+@media (max-width: 480px) {
+  .error-banner {
+    flex-direction: column;
+    align-items: flex-start;
+  }
+  
+  .error-message {
+    width: 100%;
+    margin-bottom: 0.75rem;
+  }
+  
+  .error-actions {
+    width: 100%;
+    justify-content: space-between;
+  }
+}

frontend/src/pages/WorkoutEditPage.jsx

@@ -0,0 +1,430 @@
+import { useState, useRef, useEffect } from 'react'
+import { Icon } from '../components/Icons'
+import ExercisePicker from '../components/ExercisePicker'
+import { useDraftWorkout } from '../hooks/useDraftWorkout'
+import './WorkoutEditPage.css'
+
+export default function WorkoutEditPage({ workout, onBack, onSave }) {
+  const { exercises, setExercises, clearDraft, hasDraft, restoreDraft } = 
+    useDraftWorkout(workout.id, workout.exercises || [])
+  
+  const [pickerOpen, setPickerOpen] = useState(false)
+  const [swapIndex, setSwapIndex] = useState(null) // null = adding, number = swapping
+  const [saving, setSaving] = useState(false)
+  const [error, setError] = useState(null)
+  const [syncStatus, setSyncStatus] = useState('idle') // idle | saving | saved | error
+  const [draftPromptShown, setDraftPromptShown] = useState(false)
+  const [retryCount, setRetryCount] = useState(0)
+  const [lastSavePayload, setLastSavePayload] = useState(null)
+  
+  // Timeout and toast state
+  const [saveTimeout, setSaveTimeout] = useState(false)
+  const [toast, setToast] = useState(null) // { type, message }
+  const saveStartTimeRef = useRef(null)
+  const saveTimeoutRef = useRef(null)
+  const toastTimeoutRef = useRef(null)
+
+
+  // Cleanup timeouts on unmount
+  useEffect(() => {
+    return () => {
+      if (saveTimeoutRef.current) clearTimeout(saveTimeoutRef.current)
+      if (toastTimeoutRef.current) clearTimeout(toastTimeoutRef.current)
+    }
+  }, [])
+
+  // Show and auto-hide toast notifications
+  useEffect(() => {
+    if (!toast) return
+    
+    if (toastTimeoutRef.current) clearTimeout(toastTimeoutRef.current)
+    toastTimeoutRef.current = setTimeout(() => {
+      setToast(null)
+    }, 3000)
+    
+    return () => {
+      if (toastTimeoutRef.current) clearTimeout(toastTimeoutRef.current)
+    }
+  }, [toast])
+
+    // Show draft recovery prompt on first render
+  const handleRecoverDraft = () => {
+    if (hasDraft && !draftPromptShown) {
+      setDraftPromptShown(true)
+      // Prompt is shown via conditional rendering below
+    }
+  }
+
+  const handleOpenPicker = (index = null) => {
+    setSwapIndex(index)
+    setPickerOpen(true)
+  }
+
+  const handleSelectExercise = (exercise) => {
+    if (swapIndex !== null) {
+      // Swap
+      setExercises(prev => prev.map((ex, i) => {
+        if (i === swapIndex) {
+          return {
+            ...ex,
+            exercise_id: exercise.id,
+            name: exercise.name,
+            muscle_group: exercise.muscle_group,
+            // Keep existing sets/reps
+          }
+        }
+        return ex
+      }))
+    } else {
+      // Add
+      setExercises(prev => [...prev, {
+        exercise_id: exercise.id,
+        name: exercise.name,
+        muscle_group: exercise.muscle_group,
+        sets: 3,
+        reps_min: 8,
+        reps_max: 12
+      }])
+    }
+    setPickerOpen(false)
+  }
+
+  const handleRemove = (index) => {
+    setExercises(prev => prev.filter((_, i) => i !== index))
+  }
+
+  const handleUpdate = (index, field, value) => {
+    setExercises(prev => prev.map((ex, i) => {
+      if (i === index) {
+        return { ...ex, [field]: value }
+      }
+      return ex
+    }))
+    // Clear error state on user edit
+    if (error) setError(null)
+  }
+
+  /**
+   * Determine specific error message based on error type
+   */
+  const getErrorMessage = (err) => {
+    // Network errors
+    if (!err || err instanceof TypeError && err.message.includes('fetch')) {
+      return 'Anslutning misslyckades. Försök igen?'
+    }
+    
+    // Check if error has a response (API error)
+    if (err.status) {
+      if (err.status === 400) {
+        return 'Ogiltiga ändringar. Kontrollera dina inmatningar.'
+      }
+      if (err.status === 401 || err.status === 403) {
+        return 'Du har inte behörighet att spara denna träning.'
+      }
+      if (err.status >= 500) {
+        return 'Serverfel. Försök igen senare.'
+      }
+      if (err.status >= 400) {
+        return 'Ett fel uppstod när träningen skulle sparas. Försök igen.'
+      }
+    }
+    
+    // Fallback
+    return err.message || 'Sparning misslyckades. Försök igen.'
+  }
+
+  const handleSave = async () => {
+    setSaving(true)
+    setSyncStatus('saving')
+    setError(null)
+    setSaveTimeout(false)
+    setToast(null)
+    setRetryCount(prev => prev + 1)
+    
+    // Track save start time for timeout warning
+    saveStartTimeRef.current = Date.now()
+    
+    // Set timeout warning at 8 seconds
+    if (saveTimeoutRef.current) clearTimeout(saveTimeoutRef.current)
+    saveTimeoutRef.current = setTimeout(() => {
+      setSaveTimeout(true)
+    }, 8000)
+    
+    try {
+      // Format for API
+      const payload = {
+        exercises: exercises.map(ex => ({
+          exercise_id: ex.exercise_id || ex.id, // Handle both structures
+          sets: parseInt(ex.sets) || 3,
+          reps_min: parseInt(ex.reps_min) || 8,
+          reps_max: parseInt(ex.reps_max) || 12
+        }))
+      }
+      
+      // Store payload for potential retry
+      setLastSavePayload(payload)
+      
+      // Call the save callback
+      await onSave(workout.id, payload)
+      
+      // Clear timeout warning
+      if (saveTimeoutRef.current) clearTimeout(saveTimeoutRef.current)
+      setSaveTimeout(false)
+      
+      // Success: clear draft and show confirmation
+      clearDraft()
+      setSyncStatus('saved')
+      setRetryCount(0) // Reset retry count on success
+      
+      // Show success toast
+      setToast({ type: 'success', message: 'Sparat!' })
+      
+      // Log success
+      console.log('Workout saved successfully', {
+        workoutId: workout.id,
+        exerciseCount: exercises.length,
+        retryCount,
+        duration: Date.now() - saveStartTimeRef.current
+      })
+      
+      // Reset status after 2 seconds
+      setTimeout(() => setSyncStatus('idle'), 2000)
+    } catch (err) {
+      // Clear timeout warning
+      if (saveTimeoutRef.current) clearTimeout(saveTimeoutRef.current)
+      setSaveTimeout(false)
+      
+      // Log error with context for debugging
+      console.error('Failed to save workout:', {
+        error: err,
+        workoutId: workout.id,
+        exerciseCount: exercises.length,
+        retryCount,
+        payload: lastSavePayload,
+        duration: Date.now() - saveStartTimeRef.current
+      })
+      
+      // Determine error message based on error type
+      const errorMessage = getErrorMessage(err)
+      setError(errorMessage)
+      setSyncStatus('error')
+      
+      // Show error toast
+      setToast({ type: 'error', message: 'Fel vid sparning' })
+      
+      // Keep draft on error so user doesn't lose work
+      // (useDraftWorkout already auto-saves, so no action needed here)
+    } finally {
+      setSaving(false)
+    }
+  }
+
+  const handleRetry = () => {
+    // Log retry attempt
+    console.log('User retrying save', {
+      workoutId: workout.id,
+      retryCount
+    })
+    handleSave()
+  }
+
+  const handleDiscardDraft = () => {
+    clearDraft()
+    setDraftPromptShown(true)
+    // Reset exercises to original
+    setExercises(workout.exercises || [])
+  }
+
+  // Show draft recovery prompt if we have a draft and haven't shown it yet
+  const showDraftPrompt = hasDraft && !draftPromptShown
+  if (showDraftPrompt) {
+    handleRecoverDraft()
+  }
+
+  return (
+    <div className="edit-page">
+      {/* Draft Recovery Prompt */}
+      {showDraftPrompt && (
+        <div className="draft-prompt-overlay">
+          <div className="draft-prompt-modal">
+            <h2>Du har sparat ändringar</h2>
+            <p>Vi hittade ett utkast från din senaste redigering. Vill du fortsätta eller börja om?</p>
+            <div className="draft-prompt-actions">
+              <button 
+                className="btn btn-secondary" 
+                onClick={handleDiscardDraft}
+              >
+                Börja om
+              </button>
+              <button 
+                className="btn btn-primary" 
+                onClick={() => setDraftPromptShown(true)}
+              >
+                Fortsätt redigering
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
+
+      <header className="page-header">
+        <button className="back-btn" onClick={onBack} disabled={saving}>
+          <Icon name="arrowLeft" size={18} /> Avbryt
+        </button>
+        <h1>Redigera pass</h1>
+        <div className="save-header-group">
+          {syncStatus === 'saving' && (
+            <span className="sync-status saving">
+              <Icon name="spinner" size={16} className="icon-spinner" /> Sparar...
+            </span>
+          )}
+          {syncStatus === 'saved' && (
+            <span className="sync-status saved">
+              <Icon name="checkmark" size={16} /> Sparat
+            </span>
+          )}
+          {syncStatus === 'error' && (
+            <span className="sync-status error">
+              <Icon name="alert" size={16} /> Fel
+            </span>
+          )}
+          <button 
+            className="save-header-btn" 
+            onClick={handleSave}
+            disabled={saving}
+            title={saving ? 'Sparar...' : 'Spara ändringar'}
+          >
+            {syncStatus === 'saving' ? 'Sparar...' : 'Spara'}
+          </button>
+        </div>
+      </header>
+
+      {/* Error Banner */}
+      {error && (
+        <div className="error-banner">
+          <div className="error-message">
+            <Icon name="alert" size={18} />
+            <span>{error}</span>
+          </div>
+          <div className="error-actions">
+            <button className="btn-retry" onClick={handleRetry}>
+              Försök igen
+            </button>
+            <button 
+              className="btn-close" 
+              onClick={() => setError(null)}
+              aria-label="Stäng"
+            >
+              ×
+            </button>
+          </div>
+        </div>
+      )}
+
+      {/* Save Timeout Warning */}
+      {saveTimeout && (
+        <div className="timeout-banner">
+          <Icon name="alert" size={18} />
+          <span>Sparningen tar längre än vanligt. Kontrollera din anslutning.</span>
+        </div>
+      )}
+
+      {/* Toast Notifications */}
+      {toast && (
+        <div className={`toast toast-${toast.type}`}>
+          {toast.type === 'success' && <Icon name="checkmark" size={16} />}
+          {toast.type === 'error' && <Icon name="alert" size={16} />}
+          <span>{toast.message}</span>
+        </div>
+      )}
+
+      <main className="edit-main">
+        <div className="workout-meta-card">
+          <h2>{workout.name}</h2>
+          <p>{exercises.length} övningar</p>
+        </div>
+
+        <div className="edit-exercises-list">
+          {exercises.map((ex, i) => (
+            <div key={i} className="edit-exercise-card">
+              <div className="edit-card-header">
+                <div className="edit-card-info">
+                  <h3>{ex.name}</h3>
+                  <span className="muscle-group">{ex.muscle_group}</span>
+                </div>
+                <div className="edit-card-actions">
+                  <button 
+                    className="icon-btn" 
+                    onClick={() => handleOpenPicker(i)}
+                    aria-label="Byt övning"
+                    disabled={saving}
+                  >
+                    <Icon name="swap" size={18} />
+                  </button>
+                  <button 
+                    className="icon-btn delete" 
+                    onClick={() => handleRemove(i)}
+                    aria-label="Ta bort övning"
+                    disabled={saving}
+                  >
+                    <Icon name="trash" size={18} />
+                  </button>
+                </div>
+              </div>
+
+              <div className="edit-card-settings">
+                <div className="setting-group">
+                  <label>Set</label>
+                  <input 
+                    type="number" 
+                    value={ex.sets} 
+                    onChange={e => handleUpdate(i, 'sets', e.target.value)}
+                    min="1"
+                    disabled={saving}
+                  />
+                </div>
+                <div className="setting-group">
+                  <label>Reps min</label>
+                  <input 
+                    type="number" 
+                    value={ex.reps_min} 
+                    onChange={e => handleUpdate(i, 'reps_min', e.target.value)} 
+                    min="1"
+                    disabled={saving}
+                  />
+                </div>
+                <div className="setting-group">
+                  <label>Reps max</label>
+                  <input 
+                    type="number" 
+                    value={ex.reps_max} 
+                    onChange={e => handleUpdate(i, 'reps_max', e.target.value)} 
+                    min="1"
+                    disabled={saving}
+                  />
+                </div>
+              </div>
+            </div>
+          ))}
+        </div>
+
+        <button 
+          className="add-exercise-btn" 
+          onClick={() => handleOpenPicker(null)}
+          disabled={saving}
+        >
+          <Icon name="plus" size={20} />
+          Lägg till övning
+        </button>
+      </main>
+
+      {pickerOpen && (
+        <ExercisePicker 
+          open={pickerOpen}
+          onSelect={handleSelectExercise}
+          onClose={() => setPickerOpen(false)}
+        />
+      )}
+    </div>
+  )
+}

frontend/src/pages/WorkoutSelectPage.jsx

@@ -17,13 +17,26 @@ const getWorkoutColor = (name) => {
 
 function WorkoutSelectPage({ onBack, onSelectWorkout }) {
   const [program, setProgram] = useState(null)
+  const [customWorkouts, setCustomWorkouts] = useState([])
   const [loading, setLoading] = useState(true)
   const [selectedWorkout, setSelectedWorkout] = useState(null)
+  const [resetConfirm, setResetConfirm] = useState(null)
+  const [resetting, setResetting] = useState(false)
+  const [successMessage, setSuccessMessage] = useState(null)
 
   useEffect(() => {
     fetchProgram()
+    fetchCustomWorkouts()
   }, [])
 
+  // Auto-clear success message after 3 seconds
+  useEffect(() => {
+    if (successMessage) {
+      const timer = setTimeout(() => setSuccessMessage(null), 3000)
+      return () => clearTimeout(timer)
+    }
+  }, [successMessage])
+
   const fetchProgram = async () => {
     try {
       const res = await fetch(`${API_URL}/programs/1`)
@@ -36,6 +49,29 @@ function WorkoutSelectPage({ onBack, onSelectWorkout }) {
     }
   }
 
+  const fetchCustomWorkouts = async () => {
+    try {
+      const token = localStorage.getItem('token')
+      if (!token) return
+      const res = await fetch(`${API_URL}/custom-workouts`, {
+        headers: { 'Authorization': `Bearer ${token}` }
+      })
+      const data = await res.json()
+      setCustomWorkouts(data || [])
+    } catch (err) {
+      console.error('Failed to fetch custom workouts:', err)
+    }
+  }
+
+  const getCustomWorkoutId = (programDayId) => {
+    const customWorkout = customWorkouts.find(cw => cw.source_program_day_id === programDayId)
+    return customWorkout?.id
+  }
+
+  const isWorkoutCustom = (programDayId) => {
+    return customWorkouts.some(cw => cw.source_program_day_id === programDayId)
+  }
+
   const handleSelect = (workout) => {
     setSelectedWorkout(workout)
   }
@@ -46,6 +82,38 @@ function WorkoutSelectPage({ onBack, onSelectWorkout }) {
     }
   }
 
+  const handleResetClick = (e, workoutId) => {
+    e.stopPropagation()
+    setResetConfirm(workoutId)
+  }
+
+  const handleConfirmReset = async () => {
+    if (!resetConfirm) return
+
+    setResetting(true)
+    try {
+      const token = localStorage.getItem('token')
+      const res = await fetch(`${API_URL}/custom-workouts/${resetConfirm}`, {
+        method: 'DELETE',
+        headers: { 'Authorization': `Bearer ${token}` }
+      })
+
+      if (res.ok) {
+        // Refresh custom workouts list
+        await fetchCustomWorkouts()
+        setSuccessMessage('Passet återställdes till original')
+        setSelectedWorkout(null)
+        setResetConfirm(null)
+      } else {
+        console.error('Failed to reset workout:', res.status)
+      }
+    } catch (err) {
+      console.error('Error resetting workout:', err)
+    } finally {
+      setResetting(false)
+    }
+  }
+
   if (loading) {
     return (
       <div className="select-page loading">
@@ -70,12 +138,21 @@ function WorkoutSelectPage({ onBack, onSelectWorkout }) {
           Vilken träning vill du köra idag?
         </p>
 
+        {successMessage && (
+          <div className="success-message">
+            <Icon name="check" size={18} />
+            {successMessage}
+          </div>
+        )}
+
         <div className="workout-grid">
           {program?.days?.map((workout) => {
             const iconName = getWorkoutIconName(workout.name)
             const color = getWorkoutColor(workout.name)
             const isSelected = selectedWorkout?.id === workout.id
             const exerciseCount = workout.exercises?.filter(e => e.name).length || 0
+            const isCustom = isWorkoutCustom(workout.id)
+            const customWorkoutId = getCustomWorkoutId(workout.id)
 
             return (
               <div
@@ -84,8 +161,23 @@ function WorkoutSelectPage({ onBack, onSelectWorkout }) {
                 style={{ '--workout-color': color }}
                 onClick={() => handleSelect(workout)}
               >
-                <div className="workout-icon" style={{ background: color }}>
+                <div className="workout-badge-container">
-                  <Icon name={iconName} size={28} />
+                  <div className="workout-icon" style={{ background: color }}>
+                    <Icon name={iconName} size={28} />
+                  </div>
+                  <span className={`workout-badge ${isCustom ? 'custom' : 'program'}`}>
+                    {isCustom ? 'Anpassad' : 'Program'}
+                  </span>
+                  {isCustom && (
+                    <button
+                      className="reset-btn"
+                      title="Återställ till original"
+                      onClick={(e) => handleResetClick(e, customWorkoutId)}
+                      aria-label="Återställ workout"
+                    >
+                      <Icon name="refresh" size={16} />
+                    </button>
+                  )}
                 </div>
                 <div className="workout-details">
                   <h3>{workout.name}</h3>
@@ -120,6 +212,36 @@ function WorkoutSelectPage({ onBack, onSelectWorkout }) {
           </div>
         )}
       </main>
+
+      {/* Reset confirmation dialog */}
+      {resetConfirm && (
+        <div className="modal-overlay" onClick={() => setResetConfirm(null)}>
+          <div className="modal-dialog" onClick={(e) => e.stopPropagation()}>
+            <div className="modal-header">
+              <h2>Återställ till original?</h2>
+            </div>
+            <div className="modal-body">
+              <p>Är du säker? Dina ändringar kommer att försvinna och passet återställs till programversionen.</p>
+            </div>
+            <div className="modal-footer">
+              <button
+                className="modal-btn cancel"
+                onClick={() => setResetConfirm(null)}
+                disabled={resetting}
+              >
+                Avbryt
+              </button>
+              <button
+                className="modal-btn confirm"
+                onClick={handleConfirmReset}
+                disabled={resetting}
+              >
+                {resetting ? 'Återställer...' : 'Återställ'}
+              </button>
+            </div>
+          </div>
+        </div>
+      )}
     </div>
   )
 }

frontend/src/styles/App.css

@@ -0,0 +1,25 @@
+/* Minimal app-wide styles to support the new Workout UI scaffold */
+:root{ --bg: #0b0f14; --card:#141a20; --text:#e8f0f4; --muted:#9bb2bd; --accent:#4cc9f0; }
+*{box-sizing:border-box}
+html,body,#root{height:100%}
+body{ margin:0; background:var(--bg); color:var(--text); font-family: Inter, system-ui, Arial; }
+
+/* App-wide helpers */
+.app{ min-height:100%; display:flex; flex-direction:column; }
+.page-header{ display:flex; align-items:center; justify-content:space-between; padding:14px 16px; background:#0f151a; border-bottom:1px solid #1e252c; }
+.back-btn{ border:0; background:transparent; color:#9bd2ff; cursor:pointer; font-size:14px; display:flex; align-items:center; gap:6px; }
+.header-center{ text-align:center; flex:1; }
+.header-center h1{ margin:0; font-size:18px; font-weight:600 }
+.header-subtitle{ color:#a9bdc9; font-size:12px; }
+.rest-timer-card{ padding:12px; background:#11161b; border-bottom:1px solid #1e252c; }
+.rest-timer-header{ display:flex; justify-content:space-between; align-items:center; }
+.rest-timer-label{ font-weight:600; }
+.rest-timer-time{ font-feature-settings: 'tnum'; font-variant-numeric: tabular-nums; font-size:20px; }
+.page-main{ padding:12px; display:flex; flex-direction:column; gap:12px; }
+.exercise-card{ background:#121821; border:1px solid #1e252c; border-radius:8px; padding:8px; margin-bottom:8px; }
+
+/* Simple utility for the rest of style surface */
+.exercises-section{ display:flex; flex-direction:column; gap:8px; }
+.finish-workout-btn{ align-self:center; padding:12px 20px; border-radius:999px; border:1px solid #2e2e2e; background:#1e1e1e; color:#fff; cursor:pointer; }
+
+@media (min-width: 700px){ .header-center{ text-align:center; } }

frontend/tests/gravl.spec.js

@@ -0,0 +1,17 @@
+const { test, expect } = require("@playwright/test");
+
+test("login page loads", async ({ page }) => {
+  await page.goto("/login");
+  await expect(page.locator("form")).toBeVisible();
+});
+
+test("logo exists", async ({ page }) => {
+  await page.goto("/login");
+  const logo = await page.locator("svg, img[class*=logo], .logo").first();
+  await expect(logo).toBeVisible();
+});
+
+test("dashboard loads", async ({ page }) => {
+  await page.goto("/");
+  await expect(page).toHaveTitle(/Gravl/);
+});

scripts/create-staging.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+BRANCH_NAME=$1
+if [ -z "$BRANCH_NAME" ]; then echo "Usage: $0 <branch-name>"; exit 1; fi
+STAGING_DIR=/tmp/staging-$BRANCH_NAME-$(date +%s)
+mkdir -p $STAGING_DIR
+git clone --branch feature/$BRANCH_NAME /workspace/gravl "$STAGING_DIR"
+cd "$STAGING_DIR"
+sed -i "s/PLACEHOLDER/$BRANCH_NAME/g" docker-compose.staging.yml
+mkdir -p .staging
+docker compose -f docker-compose.yml -f docker-compose.staging.yml up -d --build
+echo "{\"branch\":\"$BRANCH_NAME\",\"url\":\"https://$BRANCH_NAME.gravl.homelab.local\"}" > .staging/$BRANCH_NAME.json
+echo "✅ Staging: https://$BRANCH_NAME.gravl.homelab.local"

scripts/generate-assets.js

@@ -0,0 +1,81 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+require('dotenv').config();
+
+console.log('🎬 Gravl Multimedia Asset Generator\n');
+
+// Config
+const apiKey = process.env.VEO_API_KEY;
+const googleCreds = process.env.GOOGLE_APPLICATION_CREDENTIALS;
+const outputDir = process.env.NANO_BANANA_OUTPUT_DIR || './marketing/images';
+const videoDir = process.env.VEO_OUTPUT_DIR || './marketing/videos';
+
+// Ensure directories exist
+[outputDir, videoDir].forEach(dir => {
+  if (!fs.existsSync(dir)) {
+    fs.mkdirSync(dir, { recursive: true });
+  }
+});
+
+console.log('📁 Output directories:');
+console.log(`   Images: ${outputDir}`);
+console.log(`   Videos: ${videoDir}\n`);
+
+// Image templates for Gravl
+const imagePrompts = [
+  {
+    name: 'login-page.png',
+    prompt: 'Gravl fitness app login page with barbell logo, email/password inputs, dark theme #0a0a0f, orange accent #ff6b35, gradient background, 1280x720'
+  },
+  {
+    name: 'dashboard.png',
+    prompt: 'Gravl dashboard: stat cards showing workouts completed, total volume, streak, calendar view, animated elements, dark modern design, 1280x720'
+  },
+  {
+    name: 'workout-page.png',
+    prompt: 'Gravl workout page: exercise cards with sets/reps input, rest timer showing 90 seconds, complete button, smooth animations, dark theme, 1280x720'
+  }
+];
+
+// Video templates
+const videoPrompts = [
+  {
+    name: 'workout-demo.mp4',
+    prompt: 'Gravl fitness app demo: user opens app, selects a workout, clicks on exercise, logs 3 sets of 10 reps at 80kg, rests with 90-second countdown timer, completes workout',
+    duration: 10
+  }
+];
+
+console.log('📝 Image generation requests (mock for demo):\n');
+imagePrompts.forEach(img => {
+  console.log(`  ✓ ${img.name}`);
+  // In real usage, this would call nano-banana-pro API
+  // For now, create placeholder files
+  const filePath = path.join(outputDir, img.name);
+  fs.writeFileSync(filePath, `Placeholder: ${img.prompt}`);
+  console.log(`    → Created (placeholder): ${filePath}`);
+});
+
+console.log('\n🎥 Video generation requests (mock for demo):\n');
+videoPrompts.forEach(vid => {
+  console.log(`  ✓ ${vid.name} (${vid.duration}s)`);
+  // In real usage, this would call Veo API
+  const filePath = path.join(videoDir, vid.name);
+  fs.writeFileSync(filePath, `Placeholder: ${vid.prompt}`);
+  console.log(`    → Created (placeholder): ${filePath}`);
+});
+
+console.log('\n✨ Generation complete!\n');
+console.log('📌 Next steps:');
+console.log('  1. Set VEO_API_KEY and GOOGLE_APPLICATION_CREDENTIALS in .env');
+console.log('  2. Replace placeholder calls with actual API requests');
+console.log('  3. Run: npm install dotenv');
+console.log(`  4. Run: node scripts/generate-assets.js\n`);
+
+console.log('📂 Generated files:');
+[outputDir, videoDir].forEach(dir => {
+  const files = fs.readdirSync(dir);
+  files.forEach(f => console.log(`   ${path.join(dir, f)}`));
+});