Skip to content

Open-source gym & body-weight tracker, now in the App Store (iPhone + Apple Watch) and as an Android APK. Plan routines, log workouts, see which muscles are trained, import from Strong/Hevy/FitNotes. Self-host it or use it on the phone alone.

Merge remote-tracking branch 'pr/417'

Duarte Santos172c3b6367db
diff --cc frontend/src/sheets.jsx
index 9cd748ebf,218e32609..3e3334692
--- a/frontend/src/sheets.jsx
+++ b/frontend/src/sheets.jsx
@@@ -34,16 -32,15 +34,17 @@@ import { estimate1RM, best1RM, is1RMRec
import { exerciseHistory } from './lib/exercise-history.js'
import { policyFor, defaultIncrement, POLICIES_FOR, POLICY_NAME, POLICY_DESC, MAX_BW_SETS, weightIncrement } from './lib/progression.js'
import { normalizeRepRange } from './lib/rep-range.js'
+import { isPyramid, normalizePyramid, normalizePyramidRest, pyramidFromFlat, flatFromPyramid, pyramidLabel, PYRAMID_MAX, MAX_PYRAMID_SETS, PYRAMID_PRESETS } from './lib/pyramid.js'
import { MOBILE, shareExport, printHtml } from './lib/mobile.js'
import { speedUnitOf, toSpeed, fromSpeed } from './lib/speed.js'
-import { buildCompletedWorkout } from './lib/finish-workout.js'
+import { buildCompletedWorkout, sessionEnd } from './lib/finish-workout.js'
+import { refillAfter } from './lib/rotation.js'
import { isWarmupRow, hasCompletedWork } from './lib/workout-model.js'
import { saveSessionAsRoutine } from './lib/session-routines.js'
-import { nextUnfinishedUnit } from './lib/supersetFlow.js'
+import { repeatSessionEntries } from './lib/session-repeat.js'
import { swapActiveExercise } from './lib/active-exercise-swap.js'
import { useSheetKeyboard, useRevealActiveChip, tappable } from './lib/use-sheet-keyboard.js'
+ import { useAutoMore } from './lib/use-auto-more.js'
import { isFav, toggleFav, sortFavouritesFirst } from './lib/favourites.js'
import { buildSessionEntries, buildPlannedEntry, builtOutOfProgression } from './lib/session-start.js'
import { joinSessionNoProg } from './lib/session-noprog.js'
@@@ -1257,10 -1166,10 +1259,10 @@@ function ExercisePicker({ onPick, title
<button className="iconbtn chev" aria-label={t('Add “{0}”', exerciseNameFor(e))} style={{ padding: 8, margin: -8 }}
onClick={ev => { ev.stopPropagation(); onPick(e, true) }}><Icon name="plus" /></button>
</div>)}
- {f.length === 0 && bp === '★' && <div className="empty">{t('Nothing chosen yet — add exercises and they’ll show up here.')}</div>}
- {f.length === 0 && bp === '☆' && <div className="empty">{t('No favourites here — tap the star on an exercise to add it.')}</div>}
+ {f.length === 0 && bp === '★' && <div className="empty">{t('Nothing picked yet. Add some exercises and they’ll show up here.')}</div>}
+ {f.length === 0 && bp === '☆' && <div className="empty">{t('No favourites yet. Tap the star on an exercise to add one.')}</div>}
</div>
- {f.length > shown && <><div style={{ height: 8 }} /><Button onClick={() => setShown(s => s + 50)}>{t('Show more')}</Button></>}
+ {f.length > shown && <><div style={{ height: 8 }} /><Button ref={moreRef} onClick={() => setShown(s => s + 50)}>{t('Show more')}</Button></>}
</>
}
// `title` names what the pick is for when it is not an add — the routine editor's Replace (#110).
diff --cc frontend/src/views/Library.jsx
index e87150921,558b3b957..16b7b487d
--- a/frontend/src/views/Library.jsx
+++ b/frontend/src/views/Library.jsx
@@@ -23,10 -24,8 +24,11 @@@ export default function Library()
const [showAll, setShowAll] = useState(false) // ignore the active equipment profile for this session
const [shown, setShown] = useState(40)
const bpStrip = useRef(null), eqStrip = useRef(null)
+ const moreRef = useAutoMore(() => setShown(s => s + 40))
const profile = activeProfile(S)
+ // Your own exercises, counted the way the list below shows them (allExercises puts every
+ // custom entry in front of the catalogue; deleting one removes it from customEx outright).
+ const ownCount = (S.customEx || []).filter(c => c && c.id).length
const base = searchExercises(allExercises(S).filter(e => !bp || e.bp === bp), q)
const eqFiltered = (profile && !showAll) ? base.filter(e => exAvailable(S, e)) : base
const eqOpts = equipmentOf(eqFiltered)