Skip to content

armgit / lyftr

Public Imported from GitHub
0

Self-hosted fitness tracker. Log workouts, track nutrition, and monitor progress. Docker deployment, mobile-friendly.

UI improvements: avatar, exercise virtualizer, scroll-to-error, login cleanup

Cawlumm41b2fe5f84b2
diff --git a/web/package-lock.json b/web/package-lock.json
index fffd575..012625b 100644
--- a/web/package-lock.json
+++ b/web/package-lock.json
@@ -9,6 +9,7 @@
"version": "0.0.1",
"dependencies": {
"@tanstack/react-query": "^5.28.0",
+ "@tanstack/react-virtual": "^3.13.24",
"axios": "^1.6.2",
"date-fns": "^3.0.0",
"lucide-react": "^1.8.0",
@@ -1301,6 +1302,31 @@
"react": "^18 || ^19"
}
},
+ "node_modules/@tanstack/react-virtual": {
+ "version": "3.13.24",
+ "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.13.24.tgz",
+ "integrity": "sha512-aIJvz5OSkhNIhZIpYivrxrPTKYsjW9Uzy+sP/mx0S3sev2HyvPb7xmjbYvokzEpfgYHy/HjzJ2zFAETuUfgCpg==",
+ "dependencies": {
+ "@tanstack/virtual-core": "3.14.0"
+ },
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/tannerlinsley"
+ },
+ "peerDependencies": {
+ "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0",
+ "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
+ }
+ },
+ "node_modules/@tanstack/virtual-core": {
+ "version": "3.14.0",
+ "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.14.0.tgz",
+ "integrity": "sha512-JLANqGy/D6k4Ujmh8Tr25lGimuOXNiaVyXaCAZS0W+1390sADdGnyUdSWNIfd49gebtIxGMij4IktRVzrdr12Q==",
+ "funding": {
+ "type": "github",
+ "url": "https://github.com/sponsors/tannerlinsley"
+ }
+ },
"node_modules/@types/babel__core": {
"version": "7.20.5",
"resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
diff --git a/web/package.json b/web/package.json
index e92e443..dc7a744 100644
--- a/web/package.json
+++ b/web/package.json
@@ -14,6 +14,7 @@
},
"dependencies": {
"@tanstack/react-query": "^5.28.0",
+ "@tanstack/react-virtual": "^3.13.24",
"axios": "^1.6.2",
"date-fns": "^3.0.0",
"lucide-react": "^1.8.0",
diff --git a/web/src/components/ExercisePicker.tsx b/web/src/components/ExercisePicker.tsx
index f0eb9dd..16e1179 100644
--- a/web/src/components/ExercisePicker.tsx
+++ b/web/src/components/ExercisePicker.tsx
@@ -1,6 +1,7 @@
-import { useState, useEffect } from 'react'
+import { useState, useEffect, useRef, useCallback } from 'react'
import { createPortal } from 'react-dom'
import { ArrowLeft, Search, Dumbbell } from 'lucide-react'
+import { useVirtualizer } from '@tanstack/react-virtual'
import { exerciseAPI } from '../services/api'
import * as types from '../types'
import { muscleColorBordered, EQUIPMENT_LABEL } from '../utils/exerciseUtils'
@@ -15,6 +16,7 @@ export default function ExercisePicker({ selectedIds, onSelect, onClose }: Props
const [exercises, setExercises] = useState<types.Exercise[]>([])
const [query, setQuery] = useState('')
const [loading, setLoading] = useState(false)
+ const scrollRef = useRef<HTMLDivElement>(null)
useEffect(() => { load('') }, [])
@@ -34,6 +36,13 @@ export default function ExercisePicker({ selectedIds, onSelect, onClose }: Props
const available = exercises.filter(e => !selectedIds.includes(e.id))
+ const virtualizer = useVirtualizer({
+ count: available.length,
+ getScrollElement: () => scrollRef.current,
+ estimateSize: useCallback(() => 64, []),
+ overscan: 5,
+ })
+
return createPortal(
<div className="fixed inset-0 z-[60] bg-surface-base flex flex-col animate-slide-up">
{/* Header */}
@@ -66,7 +75,7 @@ export default function ExercisePicker({ selectedIds, onSelect, onClose }: Props
</div>
{/* List */}
- <div className="flex-1 overflow-y-auto">
+ <div ref={scrollRef} className="flex-1 overflow-y-auto">
{loading && exercises.length === 0 ? (
<div className="flex items-center justify-center py-16 text-tx-muted text-sm">
<Dumbbell className="w-5 h-5 mr-2 animate-pulse text-brand-500" />
@@ -77,47 +86,59 @@ export default function ExercisePicker({ selectedIds, onSelect, onClose }: Props
No exercises found
</div>
) : (
- <div className="px-4 py-2 space-y-1">
- {available.slice(0, 40).map(ex => (
- <button
- key={ex.id}
- type="button"
- onClick={() => onSelect(ex)}
- className="w-full flex items-center gap-3 px-3 py-3 rounded-xl hover:bg-surface-muted transition-colors text-left"
- >
- {ex.image_url ? (
- <img
- src={ex.image_url}
- alt=""
- loading="lazy"
- className="w-10 h-10 rounded-lg object-cover flex-shrink-0 bg-surface-muted"
- onError={e => { (e.target as HTMLImageElement).style.display = 'none' }}
- />
- ) : (
- <div className="w-10 h-10 rounded-lg bg-brand-500/10 border border-brand-500/20 flex items-center justify-center flex-shrink-0">
- <Dumbbell className="w-4 h-4 text-brand-500" />
- </div>
- )}
- <div className="flex-1 min-w-0">
- <p className="text-sm font-medium text-tx-primary truncate">{ex.name}</p>
- <div className="flex items-center gap-1.5 mt-0.5 flex-wrap">
- <span className={`inline-flex items-center px-1.5 py-0.5 rounded text-xs font-medium border ${muscleColorBordered(ex.muscle_group)}`}>
- {ex.muscle_group}
- </span>
- {ex.equipment && ex.equipment !== 'other' && (
- <span className="text-xs text-tx-muted">
- {EQUIPMENT_LABEL[ex.equipment] || ex.equipment}
- </span>
+ <div
+ className="px-4 py-2 relative"
+ style={{ height: virtualizer.getTotalSize() }}
+ >
+ {virtualizer.getVirtualItems().map(row => {
+ const ex = available[row.index]
+ return (
+ <div
+ key={ex.id}
+ style={{
+ position: 'absolute',
+ top: row.start,
+ left: 0,
+ right: 0,
+ height: row.size,
+ padding: '0 1rem',
+ }}
+ >
+ <button
+ type="button"
+ onClick={() => onSelect(ex)}
+ className="w-full flex items-center gap-3 px-3 py-3 rounded-xl hover:bg-surface-muted transition-colors text-left"
+ >
+ {ex.image_url ? (
+ <img
+ src={ex.image_url}
+ alt=""
+ loading="lazy"
+ className="w-10 h-10 rounded-lg object-cover flex-shrink-0 bg-surface-muted"
+ onError={e => { (e.target as HTMLImageElement).style.display = 'none' }}
+ />
+ ) : (
+ <div className="w-10 h-10 rounded-lg bg-brand-500/10 border border-brand-500/20 flex items-center justify-center flex-shrink-0">
+ <Dumbbell className="w-4 h-4 text-brand-500" />
+ </div>
)}
- </div>
+ <div className="flex-1 min-w-0">
+ <p className="text-sm font-medium text-tx-primary truncate">{ex.name}</p>
+ <div className="flex items-center gap-1.5 mt-0.5 flex-wrap">
+ <span className={`inline-flex items-center px-1.5 py-0.5 rounded text-xs font-medium border ${muscleColorBordered(ex.muscle_group)}`}>
+ {ex.muscle_group}
+ </span>
+ {ex.equipment && ex.equipment !== 'other' && (
+ <span className="text-xs text-tx-muted">
+ {EQUIPMENT_LABEL[ex.equipment] || ex.equipment}
+ </span>
+ )}
+ </div>
+ </div>
+ </button>
</div>
- </button>
- ))}
- {available.length > 40 && (
- <p className="text-xs text-tx-muted text-center py-3">
- Showing 40 of {available.length} — refine search to narrow results
- </p>
- )}
+ )
+ })}
</div>
)}
</div>
diff --git a/web/src/components/Layout.tsx b/web/src/components/Layout.tsx
index b5ce006..1b5f983 100644
--- a/web/src/components/Layout.tsx
+++ b/web/src/components/Layout.tsx
@@ -2,7 +2,7 @@ import { useState, useRef, useEffect } from 'react'
import { Outlet, Link, useLocation, useNavigate } from 'react-router-dom'
import {
Home, Dumbbell, Apple, Scale, BookOpen,
- LogOut, Moon, Sun, User, ChevronDown,
+ LogOut, Moon, Sun, User,
Shield, Timer, ChevronRight,
} from 'lucide-react'
import { useAuthStore } from '../stores/auth'
@@ -79,68 +79,62 @@ function UserMenu() {
return () => document.removeEventListener('mousedown', handler)
}, [])
- const initials = user?.email ? user.email.slice(0, 2).toUpperCase() : 'U'
+ const username = user?.email?.split('@')[0] ?? 'U'
+ const initial = username[0].toUpperCase()
return (
<div ref={ref} className="relative">
<button
onClick={() => setOpen(o => !o)}
- className="flex items-center gap-2.5 px-3 py-2 rounded-lg hover:bg-surface-muted/60 active:bg-surface-muted transition-colors group"
+ className={`w-9 h-9 rounded-full flex items-center justify-center transition-all ${
+ open
+ ? 'ring-2 ring-brand-500 ring-offset-2 ring-offset-surface-base'
+ : 'hover:ring-2 hover:ring-surface-border hover:ring-offset-2 hover:ring-offset-surface-base'
+ }`}
+ aria-label="User menu"
>
- <div className="w-8 h-8 rounded-full bg-gradient-to-br from-brand-500 to-violet-500 flex items-center justify-center flex-shrink-0 ring-1 ring-brand-400/30">
- <span className="text-xs font-bold text-white leading-none">{initials}</span>
+ <div className="w-9 h-9 rounded-full flex items-center justify-center" style={{ background: 'linear-gradient(135deg, #0891b2, #00b8d9)' }}>
+ <span className="text-sm font-bold text-white leading-none">{initial}</span>
</div>
- <span className="hidden sm:block text-sm font-medium text-tx-secondary max-w-[100px] truncate">
- {user?.email?.split('@')[0]}
- </span>
- <ChevronDown className={`w-3.5 h-3.5 text-tx-muted group-hover:text-tx-secondary transition-all duration-200 ${open ? 'rotate-180' : ''}`} />
</button>
{open && (
- <div className="absolute right-0 top-full mt-1 w-64 bg-surface-overlay border border-surface-border rounded-2xl shadow-dropdown z-50 animate-slide-up overflow-hidden">
- <div className="px-4 py-4 border-b border-surface-border/50 bg-surface-raised/40">
- <div className="flex items-center gap-3">
- <div className="w-12 h-12 rounded-full bg-gradient-to-br from-brand-500 to-violet-500 flex items-center justify-center flex-shrink-0 ring-2 ring-brand-400/30">
- <span className="text-sm font-bold text-white">{initials}</span>
- </div>
- <div className="min-w-0 flex-1">
- <p className="text-sm font-semibold text-tx-primary truncate">{user?.email?.split('@')[0]}</p>
- <p className="text-xs text-tx-muted truncate mt-0.5">{user?.email}</p>
- </div>
- </div>
+ <div className="absolute right-0 top-full mt-2 w-56 bg-surface-overlay border border-surface-border/60 rounded-2xl shadow-dropdown z-50 animate-slide-up overflow-hidden">
+ {/* User info */}
+ <div className="px-4 py-3 border-b border-surface-border/40">
+ <p className="text-sm font-semibold text-tx-primary truncate">{username}</p>
+ <p className="text-xs text-tx-muted truncate">{user?.email}</p>
</div>
- <div className="py-2">
+ {/* Actions */}
+ <div className="py-1.5">
<Link
to="/settings"
onClick={() => setOpen(false)}
className="flex items-center gap-3 px-4 py-2.5 text-sm text-tx-secondary hover:text-tx-primary hover:bg-surface-muted/50 transition-colors"
>
- <User className="w-4 h-4 text-tx-muted" />
- <span>Profile & Settings</span>
+ <User className="w-4 h-4 text-tx-muted flex-shrink-0" />
+ Settings
</Link>
<button
onClick={toggleTheme}
className="w-full flex items-center gap-3 px-4 py-2.5 text-sm text-tx-secondary hover:text-tx-primary hover:bg-surface-muted/50 transition-colors"
>
{theme === 'dark'
- ? <><Sun className="w-4 h-4 text-tx-muted" /><span>Switch to Light</span></>
- : <><Moon className="w-4 h-4 text-tx-muted" /><span>Switch to Dark</span></>
+ ? <><Sun className="w-4 h-4 text-tx-muted flex-shrink-0" />Light mode</>
+ : <><Moon className="w-4 h-4 text-tx-muted flex-shrink-0" />Dark mode</>
}
</button>
</div>
- <div className="border-t border-surface-border/50 py-2">
- <div className="flex items-center gap-2 px-4 py-2">
- <Shield className="w-3.5 h-3.5 text-brand-500 flex-shrink-0" />
- <span className="text-xs text-tx-muted">Self-hosted · localhost:3000</span>
- </div>
+ {/* Sign out */}
+ <div className="border-t border-surface-border/40 py-1.5">
<button
onClick={() => { logout(); setOpen(false) }}
className="w-full flex items-center gap-3 px-4 py-2.5 text-sm text-error-400 hover:bg-error-500/10 transition-colors"
>
- <LogOut className="w-4 h-4" />
- <span>Sign out</span>
+ <LogOut className="w-4 h-4 flex-shrink-0" />
+ Sign out
</button>
</div>
</div>
@@ -156,7 +150,7 @@ export default function Layout() {
<div className="min-h-screen flex flex-col bg-surface-base">
<header className="sticky top-0 z-50 border-b border-surface-border bg-surface-base/95 backdrop-blur-sm">
<div className="max-w-6xl mx-auto px-5 h-14 flex justify-between items-center">
- <Logo size="md" />
+ <Link to="/"><Logo size="md" /></Link>
<UserMenu />
</div>
</header>
diff --git a/web/src/components/Logo.tsx b/web/src/components/Logo.tsx
index 67d9e1b..0303def 100644
--- a/web/src/components/Logo.tsx
+++ b/web/src/components/Logo.tsx
@@ -10,7 +10,7 @@ export default function Logo({ size = 'md' }: { size?: 'sm' | 'md' | 'lg' }) {
const s = sizeMap[size];
return (
- <div className="flex items-center gap-2.5">
+ <div className="flex items-center gap-3.5">
{/* Barbell */}
<div style={{ transform: `scale(${s.scale})`, transformOrigin: 'left center' }} className="flex-shrink-0 text-slate-800 dark:text-slate-100">
<BarbellSVG />
diff --git a/web/src/pages/AddProgram.tsx b/web/src/pages/AddProgram.tsx
index 5df7e85..0bdde10 100644
--- a/web/src/pages/AddProgram.tsx
+++ b/web/src/pages/AddProgram.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import { useState, useEffect } from 'react'
import { useNavigate } from 'react-router-dom'
import { Plus, ArrowLeft, Trash2, AlertCircle, BookOpen, FileText, Zap, Target } from 'lucide-react'
import { programAPI } from '../services/api'
@@ -26,6 +26,8 @@ export default function AddProgram() {
const [pickerExercises, setPickerExercises] = useState<Record<number, types.Exercise>>({})
const [formData, setFormData] = useState<ProgramFormData>({ name: '', notes: '', exercises: [] })
+ useEffect(() => { if (error) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [error])
+
const addExercise = (exercise: types.Exercise) => {
setPickerExercises(prev => ({ ...prev, [exercise.id]: exercise }))
setFormData(prev => ({
diff --git a/web/src/pages/AddWorkout.tsx b/web/src/pages/AddWorkout.tsx
index 509aee7..59b7df5 100644
--- a/web/src/pages/AddWorkout.tsx
+++ b/web/src/pages/AddWorkout.tsx
@@ -1,4 +1,4 @@
-import { useState } from 'react'
+import { useState, useEffect } from 'react'
import { useNavigate } from 'react-router-dom'
import { Plus, ArrowLeft, Trash2, AlertCircle, Dumbbell, Clock, FileText, Zap, Target, Gauge, BookOpen, CalendarDays } from 'lucide-react'
import { workoutAPI } from '../services/api'
@@ -26,6 +26,8 @@ export default function AddWorkout() {
const [pickerExercises, setPickerExercises] = useState<Record<number, types.Exercise>>({})
const [formData, setFormData] = useState<WorkoutFormData>({ name: '', notes: '', duration: 0, date: new Date().toISOString().slice(0, 10), exercises: [] })
+ useEffect(() => { if (error) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [error])
+
const loadFromProgram = (program: types.Program) => {
const newMap: Record<number, types.Exercise> = { ...pickerExercises }
const newExercises = (program.exercises || []).map(ex => {
diff --git a/web/src/pages/EditProgram.tsx b/web/src/pages/EditProgram.tsx
index 6b2232c..6059e6d 100644
--- a/web/src/pages/EditProgram.tsx
+++ b/web/src/pages/EditProgram.tsx
@@ -28,6 +28,8 @@ export default function EditProgram() {
const [pickerExercises, setPickerExercises] = useState<Record<number, types.Exercise>>({})
const [formData, setFormData] = useState<ProgramFormData>({ name: '', notes: '', exercises: [] })
+ useEffect(() => { if (error) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [error])
+
useEffect(() => {
const programId = Number(id)
if (!programId) { navigate('/programs'); return }
diff --git a/web/src/pages/EditWorkout.tsx b/web/src/pages/EditWorkout.tsx
index 13d860e..9feb3f6 100644
--- a/web/src/pages/EditWorkout.tsx
+++ b/web/src/pages/EditWorkout.tsx
@@ -26,6 +26,8 @@ export default function EditWorkout() {
const [formData, setFormData] = useState<WorkoutFormData>({ name: '', notes: '', duration: 0, exercises: [] })
const [originalStartedAt, setOriginalStartedAt] = useState('')
+ useEffect(() => { if (error) window.scrollTo({ top: 0, behavior: 'smooth' }) }, [error])
+
useEffect(() => {
const workoutId = Number(id)
if (!workoutId) { navigate('/workouts'); return }
diff --git a/web/src/pages/Login.tsx b/web/src/pages/Login.tsx
index 655e4a3..d5eb6af 100644
--- a/web/src/pages/Login.tsx
+++ b/web/src/pages/Login.tsx
@@ -185,14 +185,8 @@ export default function Login() {
{/* Password */}
<div>
- <div className="flex items-center justify-between mb-2">
+ <div className="mb-2">
<label htmlFor="password" className="label">Password</label>
- <button
- type="button"
- className="text-xs text-brand-400 font-medium hover:text-brand-300 transition-colors"
- >
- Forgot?
- </button>
</div>
<input
id="password"
@@ -231,16 +225,18 @@ export default function Login() {
<div className="flex-1 h-px bg-surface-border" />
</div>
- {/* Demo button */}
- <button
- type="button"
- onClick={handleDemoLogin}
- disabled={isLoading}
- className="btn-secondary btn-lg w-full flex items-center justify-center gap-2"
- >
- <Zap className="w-4 h-4 text-warning-400" />
- Try demo account
- </button>
+ {/* Demo button — dev only */}
+ {import.meta.env.DEV && (
+ <button
+ type="button"
+ onClick={handleDemoLogin}
+ disabled={isLoading}
+ className="btn-secondary btn-lg w-full flex items-center justify-center gap-2"
+ >
+ <Zap className="w-4 h-4 text-warning-400" />
+ Try demo account
+ </button>
+ )}
</form>
{/* Sign up link */}