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.
JavaScript apple-watchbodyweightdockerfitnessfitness-trackergymhealthiosmcpnodejspasskeysprogressive-web-applicationspwareactself-hostedself-hostingvitewebauthnweightliftingworkout-tracker
Workout screen: the session has the whole screen
Duarte Santos6d17a7d01e72
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsxindex 6d7cf8e91..9e57c9fd0 100644--- a/frontend/src/App.jsx+++ b/frontend/src/App.jsx@@ -162,6 +162,16 @@ function Shell() {}, [loc.pathname, navType])// bound to the workout, not to the route — checking Stats mid-session keeps the screen onuseWakeLock(!!S.active && !S.active.editingWorkoutId && S.keepAwake !== false)+ // A running workout has the whole screen (v1.3.11): no tab bar, and the rest bar docks to the+ // bottom edge in its place. Its header's ⌄ goes back to the app, where the tab bar's Resume+ // brings it back.+ const inWorkout = loc.pathname === '/workout' && !!S.active+ useEffect(() => {+ document.body.classList.toggle('no-tabbar', inWorkout)+ return () => document.body.classList.remove('no-tabbar')+ }, [inWorkout])+ // The chat owns the bottom of the screen as well: its composer sits where the tabs would be.+ const noTabs = inWorkout || loc.pathname === '/coach'const authed = user || isGuestif (!ready && !authed) return (@@ -212,8 +222,7 @@ function Shell() {would ride along with the page for the length of it. Decides for itself when to show —including on the sign-in screen, when the server has just ended the session. */}<SyncBanner />- {/* The chat owns the bottom of the screen: its composer sits where the tabs would be. */}- {loc.pathname !== '/coach' && <TabBar onStart={startFlow} />}+ {!noTabs && <TabBar onStart={startFlow} />}<RestTimer /><Modals /><Toast />diff --git a/frontend/src/components/WorkoutThumb.jsx b/frontend/src/components/WorkoutThumb.jsxnew file mode 100644index 000000000..f62825b18--- /dev/null+++ b/frontend/src/components/WorkoutThumb.jsx@@ -0,0 +1,19 @@+import { isCustomEx } from '../lib/exercises.js'+import { mediaOf, cleanUrl } from '../lib/media-refs.js'+import { t } from '../lib/i18n.js'+import { Thumb } from './Media.jsx'+import Icon from './Icon.jsx'++// Whether an exercise has anything for the workout's media slot to show: the dataset's animation+// for a built-in, its own photo, video or link for a custom one (CustomMedia.jsx).+export const hasWorkoutMedia = ex => !!ex && (isCustomEx(ex) ? !!(mediaOf(ex) || cleanUrl(ex.url)) : !!ex.gif)++// The small picture next to the exercise name when animations are set to Small (v1.3.11): the+// sets get the screen, and a tap brings the full animation back (the same gifSize switch as the+// animation's own Minimize, so it sticks like that one does).+export default function WorkoutThumb({ ex, onExpand }) {+ return <button type="button" className="wthumb" aria-label={t('Expand')} title={t('Expand')} onClick={onExpand}>+ <Thumb ex={ex} />+ <span className="wthumb-x" aria-hidden="true"><Icon name="expand" /></span>+ </button>+}diff --git a/frontend/src/index.css b/frontend/src/index.cssindex 644b9510f..fc6fb2da5 100644--- a/frontend/src/index.css+++ b/frontend/src/index.css@@ -790,6 +790,24 @@ body.chips-dragging *{cursor:inherit}@supports not ((backdrop-filter:blur(1px)) or (-webkit-backdrop-filter:blur(1px))){.whdr.stick{background:var(--bg)}}+/* The workout's own header (v1.3.11): ⌄ (or the editor's ✕), the name with the clock and set+ count, ⋯, and a labelled Finish pill. The name block takes what is left and truncates; the pill+ never shrinks. */+.hdr.whdr-bar{align-items:center;gap:8px;margin:4px 0 12px}+.whdr-mid{flex:1;min-width:0;text-align:center}+.whdr-name{font-weight:600;font-size:16px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}+.whdr-mid .sub{font-size:13px;margin-top:1px;font-variant-numeric:tabular-nums;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}+.btn.pill.whdr-finish{width:auto;flex:none;padding:8px 16px;border-radius:99px;font-size:15px;max-width:40%}+/* Animations set to Small: the picture beside the exercise name, with an expand badge. */+.wthumb{position:relative;flex:none;width:48px;height:48px;border-radius:10px;overflow:hidden;padding:0}+.wthumb .thumb{width:48px;height:48px;border-radius:10px}+.wthumb .thumb-x{background:var(--surface-3)}+.wthumb-x{+ position:absolute;inset-inline-end:3px;bottom:3px;width:16px;height:16px;border-radius:5px;+ display:flex;align-items:center;justify-content:center;font-size:10px;+ background:rgba(0,0,0,.55);color:#fff;--icon-stroke:2.4;+}+.exhd{align-items:center}.wprog{height:4px;background:var(--surface-2);border-radius:99px;overflow:hidden;margin-bottom:16px}.wprog i{display:block;height:100%;background:var(--acc);border-radius:99px;transition:width var(--med) var(--ease)}.exmedia{position:relative;border-radius:var(--r-lg);overflow:hidden;background:#fff;margin-bottom:12px}diff --git a/frontend/src/lib/pt-br-locale.test.js b/frontend/src/lib/pt-br-locale.test.jsindex a6bcc1ea0..795a6d0c2 100644--- a/frontend/src/lib/pt-br-locale.test.js+++ b/frontend/src/lib/pt-br-locale.test.js@@ -41,7 +41,7 @@ describe('Brazilian Portuguese locale', () => {// has to be taught is a number nobody reads. What the numbers stood for is asserted above.// If the hash fails, review the changed keys and wording before accepting a new one. From// frontend/: node scripts/pt-br-inheritance-fingerprint.mjs --list- expect(fingerprint, 'pt-PT inheritance changed; review the inherited pt-BR wording').toBe('4c0c096ff93f2c662360626d723b8c45cb09c2b7fbb1f1b7c1879245a8901539')+ expect(fingerprint, 'pt-PT inheritance changed; review the inherited pt-BR wording').toBe('92dbe6310a34fbbfc181841ba8e9dd8a591a89e6feec512bee8b9bf61676ccf1')})test('does not leak European Portuguese UI terms', () => {diff --git a/frontend/src/locales/ar.js b/frontend/src/locales/ar.jsindex a47167e11..448876de9 100644--- a/frontend/src/locales/ar.js+++ b/frontend/src/locales/ar.js@@ -353,7 +353,6 @@ export default {'upper legs': 'الفخذان','waist': 'الخصر','full body': 'الجسم كامل',- 'Details': 'التفاصيل','Finish': 'إنهاء','Start {0}': 'بدء {0}','Guest mode: your data lives only in this browser.': 'وضع الضيف: بياناتك تعيش في هذا المتصفح فقط.',@@ -763,7 +762,6 @@ export default {'Back': 'رجوع','Reps up to': 'تكرارات حتى','The next regular target continues from the last included workout.': 'يستمر الهدف المنتظم التالي من آخر تمرين مدرج.',- 'Open progression settings': 'فتح إعدادات التقدم','Hevy is rate-limiting requests. Wait a minute and try again': 'Hevy يحد من معدل الطلبات. انتظر دقيقة وحاول مجددًا','Log a past workout': 'تسجيل تمرين سابق','Logged on the usual workout screen, without timers.': 'يُسجل في شاشة التمرين المعتادة، دون مؤقتات.',@@ -1227,7 +1225,6 @@ export default {'Scan or import a code first': 'امسح رمزًا أو استورده أولًا','Add note': 'إضافة ملاحظة','Edit note': 'تعديل الملاحظة',- 'Progression settings': 'إعدادات التقدم','Set {0}': 'المجموعة {0}','Drop set': 'دروب سِت','Rest-pause burst': 'دفعة ريست بوز',@@ -1763,7 +1760,6 @@ export default {// --- update a routine from a running workout ---'Update routine': 'تحديث الروتين','Update “{0}”?': 'تحديث «{0}»؟',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'انسخ مجموعات الإحماء لهذا التمرين، والراحة والملاحظة من إعدادات التقدم الخاصة به، إلى الروتين. تبقى الملاحظة التي أضفتها لهذا اليوم مع هذا التمرين. يبقى سجل تمارينك كما هو.','Routine updated': 'تم تحديث الروتين','per side': 'لكل جانب','Left': 'يسار',@@ -1927,4 +1923,14 @@ export default {'Workout settings': 'إعدادات التمرين الحالي','Default ({0})': 'الافتراضي ({0})','Rest for this exercise': 'الراحة لهذا التمرين',+ 'Add to this set': 'أضف إلى هذه المجموعة',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'انسخ مجموعات الإحماء لهذا التمرين، والراحة والملاحظة من إعدادات التمرين الخاصة به، إلى الروتين. تبقى الملاحظة التي أضفتها لهذا اليوم مع هذا التمرين. يبقى سجل تمارينك كما هو.',+ 'Discard workout': 'تجاهل التمرين',+ 'Exercise settings': 'إعدادات التمرين',+ 'How to do it': 'طريقة الأداء',+ 'Look it up': 'للاطلاع',+ 'Open exercise settings': 'افتح إعدادات التمرين',+ 'Order and supersets': 'الترتيب والمجموعات المتتالية',+ 'Sets, reps, rest, progression': 'المجموعات، التكرارات، الراحة، التقدم',+ 'This workout': 'هذا التمرين',}diff --git a/frontend/src/locales/de.js b/frontend/src/locales/de.jsindex 9df2bc706..faa334552 100644--- a/frontend/src/locales/de.js+++ b/frontend/src/locales/de.js@@ -511,7 +511,6 @@ export default {'upper arms': 'Oberarme', 'upper legs': 'Oberschenkel', 'waist': 'Rumpf','full body': 'Ganzkörper',// --- data terms: equipment ---- 'Details': 'Details','Finish': 'Beenden','Start {0}': '{0} starten','Guest mode: your data lives only in this browser.': 'Gastmodus: deine Daten leben nur in diesem Browser.',@@ -1258,7 +1257,6 @@ export default {'What should change?': 'Was soll anders sein?','Coach is thinking…': 'Coach denkt nach…','Message the Coach…': 'Nachricht an den Coach…',- 'Open progression settings': 'Progressions-Einstellungen öffnen','Hevy is rate-limiting requests. Wait a minute and try again': 'Hevy drosselt die Anfragen. Eine Minute warten und erneut versuchen',// --- log a past workout ---'Log a past workout': 'Vergangenes Training eintragen',@@ -1347,7 +1345,6 @@ export default {'Camera access was denied. Allow it in your browser and try again.': 'Kamerazugriff wurde verweigert. Erlaube ihn im Browser und versuch es erneut.','Add note': 'Notiz hinzufügen','Edit note': 'Notiz bearbeiten',- 'Progression settings': 'Progressions-Einstellungen','Don’t count for progression': 'Nicht für die Progression zählen','This exercise, this session only': 'Nur diese Übung, nur in dieser Einheit','Not counted for progression': 'Zählt nicht für die Progression',@@ -1730,7 +1727,6 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Routine aktualisieren','Update “{0}”?': 'Routine „{0}“ aktualisieren?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Übernimmt die Aufwärmsätze dieser Übung sowie Pause und Notiz aus ihren Progressions-Einstellungen in die Routine. Eine Notiz für heute bleibt bei diesem Training. Dein Trainingsverlauf bleibt erhalten.','Routine updated': 'Routine aktualisiert','per side': 'pro Seite','Left': 'Links',@@ -1894,4 +1890,14 @@ export default {'Workout settings': 'Trainings-Einstellungen','Default ({0})': 'Standard ({0})','Rest for this exercise': 'Pause für diese Übung',+ 'Add to this set': 'Zu diesem Satz hinzufügen',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Übernimmt die Aufwärmsätze dieser Übung sowie Pause und Notiz aus ihren Übungs-Einstellungen in die Routine. Eine Notiz für heute bleibt bei diesem Training. Dein Trainingsverlauf bleibt erhalten.',+ 'Discard workout': 'Training verwerfen',+ 'Exercise settings': 'Übungs-Einstellungen',+ 'How to do it': 'So geht’s',+ 'Look it up': 'Nachschlagen',+ 'Open exercise settings': 'Übungs-Einstellungen öffnen',+ 'Order and supersets': 'Reihenfolge und Supersätze',+ 'Sets, reps, rest, progression': 'Sätze, Wdh., Pause, Progression',+ 'This workout': 'Dieses Training',}diff --git a/frontend/src/locales/es.js b/frontend/src/locales/es.jsindex 2566513f6..054943067 100644--- a/frontend/src/locales/es.js+++ b/frontend/src/locales/es.js@@ -493,7 +493,6 @@ export default {'lower legs': 'pantorrillas', 'neck': 'cuello', 'shoulders': 'hombros','upper arms': 'brazos', 'upper legs': 'piernas', 'waist': 'abdomen','full body': 'cuerpo completo',- 'Details': 'Detalles','Finish': 'Terminar','Start {0}': 'Empezar {0}','Guest mode: your data lives only in this browser.': 'Modo invitado: tus datos solo viven en este navegador.',@@ -1238,7 +1237,6 @@ export default {'What should change?': '¿Qué debería cambiar?','Coach is thinking…': 'El Coach está pensando…','Message the Coach…': 'Escribe al Coach…',- 'Open progression settings': 'Abrir ajustes de progresión','Hevy is rate-limiting requests. Wait a minute and try again': 'Hevy está limitando las solicitudes. Espera un minuto y vuelve a intentarlo',// --- log a past workout ---'Log a past workout': 'Registrar un entrenamiento pasado',@@ -1327,7 +1325,6 @@ export default {'Camera access was denied. Allow it in your browser and try again.': 'Se denegó el acceso a la cámara. Permítelo en el navegador e inténtalo de nuevo.','Add note': 'Añadir nota','Edit note': 'Editar nota',- 'Progression settings': 'Ajustes de progresión','Don’t count for progression': 'No contar para la progresión','This exercise, this session only': 'Solo este ejercicio, solo en esta sesión','Not counted for progression': 'No cuenta para la progresión',@@ -1710,7 +1707,6 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Actualizar rutina','Update “{0}”?': '¿Actualizar «{0}»?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Copia a la rutina las series de calentamiento de este ejercicio, y el descanso y la nota de sus Ajustes de progresión. Una nota añadida para hoy se queda con este entrenamiento. Tu historial de entrenamientos se conserva.','Routine updated': 'Rutina actualizada','per side': 'por lado','Left': 'Izquierda',@@ -1874,4 +1870,14 @@ export default {'Workout settings': 'Ajustes del entrenamiento','Default ({0})': 'Predeterminado ({0})','Rest for this exercise': 'Descanso de este ejercicio',+ 'Add to this set': 'Añadir a esta serie',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Copia a la rutina las series de calentamiento de este ejercicio, y el descanso y la nota de sus Ajustes del ejercicio. Una nota añadida para hoy se queda con este entrenamiento. Tu historial de entrenamientos se conserva.',+ 'Discard workout': 'Descartar entrenamiento',+ 'Exercise settings': 'Ajustes del ejercicio',+ 'How to do it': 'Cómo se hace',+ 'Look it up': 'Consultar',+ 'Open exercise settings': 'Abrir ajustes del ejercicio',+ 'Order and supersets': 'Orden y superseries',+ 'Sets, reps, rest, progression': 'Series, reps, descanso, progresión',+ 'This workout': 'Este entrenamiento',}diff --git a/frontend/src/locales/fr.js b/frontend/src/locales/fr.jsindex 9f8e1a342..cefe6e8f0 100644--- a/frontend/src/locales/fr.js+++ b/frontend/src/locales/fr.js@@ -493,7 +493,6 @@ export default {'lower legs': 'mollets', 'neck': 'cou', 'shoulders': 'épaules','upper arms': 'bras', 'upper legs': 'cuisses', 'waist': 'abdos','full body': 'corps entier',- 'Details': 'Détails','Finish': 'Terminer','Start {0}': 'Commencer {0}','Guest mode: your data lives only in this browser.': 'Mode invité : tes données ne vivent que dans ce navigateur.',@@ -1238,7 +1237,6 @@ export default {'What should change?': 'Que faut-il changer ?','Coach is thinking…': 'Le Coach réfléchit…','Message the Coach…': 'Écrire au Coach…',- 'Open progression settings': 'Ouvrir les réglages de progression','Hevy is rate-limiting requests. Wait a minute and try again': 'Hevy limite les requêtes. Attendez une minute puis réessayez',// --- log a past workout ---'Log a past workout': 'Enregistrer une séance passée',@@ -1327,7 +1325,6 @@ export default {'Camera access was denied. Allow it in your browser and try again.': 'L’accès à la caméra a été refusé. Autorisez-le dans le navigateur et réessayez.','Add note': 'Ajouter une note','Edit note': 'Modifier la note',- 'Progression settings': 'Réglages de progression','Don’t count for progression': 'Ne pas compter pour la progression','This exercise, this session only': 'Seulement cet exercice, seulement pour cette séance','Not counted for progression': 'Ne compte pas pour la progression',@@ -1710,7 +1707,6 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Mettre à jour la routine','Update “{0}”?': 'Mettre à jour la routine « {0} » ?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Copie dans la routine les séries d’échauffement de cet exercice, ainsi que le repos et la note de ses Réglages de progression. Une note ajoutée pour aujourd’hui reste avec cette séance. Ton historique d’entraînement est conservé.','Routine updated': 'Routine mise à jour','per side': 'par côté','Left': 'Gauche',@@ -1874,4 +1870,14 @@ export default {'Workout settings': 'Réglages de la séance','Default ({0})': 'Par défaut ({0})','Rest for this exercise': 'Repos pour cet exercice',+ 'Add to this set': 'Ajouter à cette série',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Copie dans la routine les séries d’échauffement de cet exercice, ainsi que le repos et la note de ses Réglages de l’exercice. Une note ajoutée pour aujourd’hui reste avec cette séance. Ton historique d’entraînement est conservé.',+ 'Discard workout': 'Abandonner la séance',+ 'Exercise settings': 'Réglages de l’exercice',+ 'How to do it': 'Comment le faire',+ 'Look it up': 'À consulter',+ 'Open exercise settings': 'Ouvrir les réglages de l’exercice',+ 'Order and supersets': 'Ordre et supersets',+ 'Sets, reps, rest, progression': 'Séries, reps, repos, progression',+ 'This workout': 'Cette séance',}diff --git a/frontend/src/locales/hi.js b/frontend/src/locales/hi.jsindex b6224613b..dc52e4c58 100644--- a/frontend/src/locales/hi.js+++ b/frontend/src/locales/hi.js@@ -493,7 +493,6 @@ export default {'lower legs': 'पिंडलियाँ', 'neck': 'गर्दन', 'shoulders': 'कंधे','upper arms': 'बाजू', 'upper legs': 'जाँघें', 'waist': 'पेट','full body': 'पूरा शरीर',- 'Details': 'विवरण','Finish': 'समाप्त','Start {0}': '{0} शुरू करें','Guest mode: your data lives only in this browser.': 'अतिथि मोड: आपका डेटा केवल इसी ब्राउज़र में रहता है।',@@ -1238,7 +1237,6 @@ export default {'What should change?': 'क्या बदलना चाहिए?','Coach is thinking…': 'कोच सोच रहा है…','Message the Coach…': 'कोच को संदेश…',- 'Open progression settings': 'प्रगति सेटिंग्स खोलें','Hevy is rate-limiting requests. Wait a minute and try again': 'Hevy अनुरोधों को सीमित कर रहा है। एक मिनट रुकें और फिर से कोशिश करें',// --- log a past workout ---'Log a past workout': 'पिछला वर्कआउट दर्ज करें',@@ -1327,7 +1325,6 @@ export default {'Camera access was denied. Allow it in your browser and try again.': 'कैमरे की अनुमति नहीं मिली। ब्राउज़र में अनुमति दें और फिर कोशिश करें।','Add note': 'नोट जोड़ें','Edit note': 'नोट संपादित करें',- 'Progression settings': 'प्रगति सेटिंग','Don’t count for progression': 'प्रोग्रेशन में न गिनें','This exercise, this session only': 'सिर्फ़ यह व्यायाम, सिर्फ़ इस सत्र में','Not counted for progression': 'प्रोग्रेशन में नहीं गिना जाएगा',@@ -1710,7 +1707,6 @@ export default {// --- update a routine from a running workout ---'Update routine': 'रूटीन अपडेट करें','Update “{0}”?': 'रूटीन “{0}” अपडेट करें?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'इस एक्सरसाइज़ के वार्म-अप सेट, और इसकी प्रगति सेटिंग से आराम और नोट को रूटीन में कॉपी करें। आज के लिए जोड़ा गया नोट इसी वर्कआउट के साथ रहता है। आपका वर्कआउट इतिहास सुरक्षित रहता है।','Routine updated': 'रूटीन अपडेट हो गया','per side': 'प्रति तरफ़','Left': 'बायाँ',@@ -1874,4 +1870,14 @@ export default {'Workout settings': 'वर्कआउट सेटिंग','Default ({0})': 'डिफ़ॉल्ट ({0})','Rest for this exercise': 'इस एक्सरसाइज़ का आराम',+ 'Add to this set': 'इस सेट में जोड़ें',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'इस एक्सरसाइज़ के वार्म-अप सेट, और इसकी एक्सरसाइज़ सेटिंग से आराम और नोट को रूटीन में कॉपी करें। आज के लिए जोड़ा गया नोट इसी वर्कआउट के साथ रहता है। आपका वर्कआउट इतिहास सुरक्षित रहता है।',+ 'Discard workout': 'वर्कआउट छोड़ें',+ 'Exercise settings': 'एक्सरसाइज़ सेटिंग',+ 'How to do it': 'कैसे करें',+ 'Look it up': 'देखें',+ 'Open exercise settings': 'एक्सरसाइज़ सेटिंग खोलें',+ 'Order and supersets': 'क्रम और सुपरसेट',+ 'Sets, reps, rest, progression': 'सेट, रेप्स, आराम, प्रगति',+ 'This workout': 'यह वर्कआउट',}diff --git a/frontend/src/locales/hu.js b/frontend/src/locales/hu.jsindex cd115ad7e..29e1cf17a 100644--- a/frontend/src/locales/hu.js+++ b/frontend/src/locales/hu.js@@ -496,7 +496,6 @@ export default {'upper arms': 'felkar', 'upper legs': 'comb', 'waist': 'derék','full body': 'teljes test',// --- data terms: equipment ---- 'Details': 'Részletek','Finish': 'Befejezés','Start {0}': '{0} indítása','Guest mode: your data lives only in this browser.': 'Vendég mód: az adataid csak ebben a böngészőben élnek.',@@ -906,7 +905,6 @@ export default {'Deload routine': 'Deload rutin','Its workouts do not count toward progression. They still show in history and statistics.': 'Az edzései nem számítanak bele a progresszióba. Az előzményekben és a statisztikában továbbra is megjelennek.','A deload routine opens at the numbers set here, so the progression above does not apply to it.': 'A deload rutin az itt beállított értékekkel indul, így a fenti progresszió nem vonatkozik rá.',- 'Open progression settings': 'Progresszió beállításainak megnyitása','Hevy is rate-limiting requests. Wait a minute and try again': 'A Hevy korlátozza a kéréseket. Várj egy percet, és próbáld újra',// --- log a past workout ---'Log a past workout': 'Korábbi edzés rögzítése',@@ -1330,7 +1328,6 @@ export default {'Camera access was denied. Allow it in your browser and try again.': 'A kamera-hozzáférés elutasítva. Engedélyezd a böngészőben, és próbáld újra.','Add note': 'Jegyzet hozzáadása','Edit note': 'Jegyzet szerkesztése',- 'Progression settings': 'Progresszió beállításai','Don’t count for progression': 'Ne számítson bele a progresszióba','This exercise, this session only': 'Csak ez a gyakorlat, csak ezen az edzésen','Not counted for progression': 'Nem számít bele a progresszióba',@@ -1713,7 +1710,6 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Rutin frissítése','Update “{0}”?': 'Frissíted a(z) „{0}” rutint?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Átmásolja a rutinba a gyakorlat bemelegítő sorozatait, valamint a pihenőt és a jegyzetet a Progresszió beállításaiból. A mai napra írt jegyzet ennél az edzésnél marad. Az edzéselőzményeid megmaradnak.','Routine updated': 'Rutin frissítve','per side': 'oldalanként','Left': 'Bal',@@ -1877,4 +1873,14 @@ export default {'Workout settings': 'Edzés beállításai','Default ({0})': 'Alapértelmezett ({0})','Rest for this exercise': 'Pihenő ennél a gyakorlatnál',+ 'Add to this set': 'Hozzáadás ehhez a sorozathoz',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Átmásolja a rutinba a gyakorlat bemelegítő sorozatait, valamint a pihenőt és a jegyzetet a Gyakorlat beállításaiból. A mai napra írt jegyzet ennél az edzésnél marad. Az edzéselőzményeid megmaradnak.',+ 'Discard workout': 'Edzés elvetése',+ 'Exercise settings': 'Gyakorlat beállításai',+ 'How to do it': 'Így csináld',+ 'Look it up': 'Utánanézni',+ 'Open exercise settings': 'Gyakorlat beállításainak megnyitása',+ 'Order and supersets': 'Sorrend és szupersorozatok',+ 'Sets, reps, rest, progression': 'Sorozatok, ismétlések, pihenő, progresszió',+ 'This workout': 'Ez az edzés',}diff --git a/frontend/src/locales/it.js b/frontend/src/locales/it.jsindex e1e246617..ab2682a23 100644--- a/frontend/src/locales/it.js+++ b/frontend/src/locales/it.js@@ -493,7 +493,6 @@ export default {'lower legs': 'polpacci', 'neck': 'collo', 'shoulders': 'spalle','upper arms': 'braccia', 'upper legs': 'gambe', 'waist': 'addome','full body': 'corpo intero',- 'Details': 'Dettagli','Finish': 'Termina','Start {0}': 'Inizia {0}','Guest mode: your data lives only in this browser.': 'Modalità ospite: i tuoi dati vivono solo in questo browser.',@@ -1238,7 +1237,6 @@ export default {'What should change?': 'Cosa dovrebbe cambiare?','Coach is thinking…': 'Il Coach sta pensando…','Message the Coach…': 'Scrivi al Coach…',- 'Open progression settings': 'Apri le impostazioni di progressione','Hevy is rate-limiting requests. Wait a minute and try again': 'Hevy sta limitando le richieste. Attendi un minuto e riprova',// --- log a past workout ---'Log a past workout': 'Registra un allenamento passato',@@ -1327,7 +1325,6 @@ export default {'Camera access was denied. Allow it in your browser and try again.': 'Accesso alla fotocamera negato. Consentilo nel browser e riprova.','Add note': 'Aggiungi nota','Edit note': 'Modifica nota',- 'Progression settings': 'Impostazioni di progressione','Don’t count for progression': 'Non contare per la progressione','This exercise, this session only': 'Solo questo esercizio, solo in questa sessione','Not counted for progression': 'Non conta per la progressione',@@ -1710,7 +1707,6 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Aggiorna la routine','Update “{0}”?': 'Aggiornare la routine «{0}»?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Copia nella routine le serie di riscaldamento di questo esercizio, e il recupero e la nota delle sue Impostazioni di progressione. Una nota aggiunta per oggi resta con questo allenamento. Il tuo storico degli allenamenti resta intatto.','Routine updated': 'Routine aggiornata','per side': 'per lato','Left': 'Sinistra',@@ -1874,4 +1870,14 @@ export default {'Workout settings': 'Impostazioni allenamento','Default ({0})': 'Predefinito ({0})','Rest for this exercise': 'Recupero per questo esercizio',+ 'Add to this set': 'Aggiungi a questa serie',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Copia nella routine le serie di riscaldamento di questo esercizio, e il recupero e la nota delle sue Impostazioni esercizio. Una nota aggiunta per oggi resta con questo allenamento. Il tuo storico degli allenamenti resta intatto.',+ 'Discard workout': 'Scarta allenamento',+ 'Exercise settings': 'Impostazioni esercizio',+ 'How to do it': 'Come si fa',+ 'Look it up': 'Da consultare',+ 'Open exercise settings': 'Apri impostazioni esercizio',+ 'Order and supersets': 'Ordine e superset',+ 'Sets, reps, rest, progression': 'Serie, rip., recupero, progressione',+ 'This workout': 'Questo allenamento',}diff --git a/frontend/src/locales/ko.js b/frontend/src/locales/ko.jsindex c96b85af4..e17261279 100644--- a/frontend/src/locales/ko.js+++ b/frontend/src/locales/ko.js@@ -493,7 +493,6 @@ export default {'lower legs': '종아리', 'neck': '목', 'shoulders': '어깨','upper arms': '팔', 'upper legs': '허벅지', 'waist': '복부','full body': '전신',- 'Details': '상세','Finish': '마치기','Start {0}': '{0} 시작','Guest mode: your data lives only in this browser.': '게스트 모드: 데이터는 이 브라우저에만 저장됩니다.',@@ -1238,7 +1237,6 @@ export default {'What should change?': '무엇을 바꿀까요?','Coach is thinking…': '코치가 생각 중…','Message the Coach…': '코치에게 메시지…',- 'Open progression settings': '진행 설정 열기','Hevy is rate-limiting requests. Wait a minute and try again': 'Hevy가 요청을 제한하고 있습니다. 1분 정도 기다렸다가 다시 시도하세요',// --- log a past workout ---'Log a past workout': '지난 운동 기록',@@ -1327,7 +1325,6 @@ export default {'Camera access was denied. Allow it in your browser and try again.': '카메라 접근이 거부되었습니다. 브라우저에서 허용한 뒤 다시 시도하세요.','Add note': '메모 추가','Edit note': '메모 편집',- 'Progression settings': '진행 설정','Don’t count for progression': '점진적 증가에 반영하지 않기','This exercise, this session only': '이 운동만, 이번 세션에만','Not counted for progression': '점진적 증가에 반영되지 않음',@@ -1710,7 +1707,6 @@ export default {// --- update a routine from a running workout ---'Update routine': '루틴 업데이트','Update “{0}”?': '“{0}” 루틴을 업데이트할까요?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': '이 운동의 워밍업 세트와 진행 설정의 휴식, 메모를 루틴에 복사합니다. 오늘을 위해 추가한 메모는 이 운동 기록에 남습니다. 운동 기록은 그대로 유지됩니다.','Routine updated': '루틴 업데이트됨','per side': '한쪽당','Left': '왼쪽',@@ -1874,4 +1870,14 @@ export default {'Workout settings': '운동 중 설정','Default ({0})': '기본값 ({0})','Rest for this exercise': '이 운동의 휴식',+ 'Add to this set': '이 세트에 추가',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': '이 운동의 워밍업 세트와 운동 설정의 휴식, 메모를 루틴에 복사합니다. 오늘을 위해 추가한 메모는 이 운동 기록에 남습니다. 운동 기록은 그대로 유지됩니다.',+ 'Discard workout': '운동 버리기',+ 'Exercise settings': '운동 설정',+ 'How to do it': '하는 방법',+ 'Look it up': '살펴보기',+ 'Open exercise settings': '운동 설정 열기',+ 'Order and supersets': '순서와 슈퍼세트',+ 'Sets, reps, rest, progression': '세트, 반복, 휴식, 진행',+ 'This workout': '이번 운동',}diff --git a/frontend/src/locales/pl.js b/frontend/src/locales/pl.jsindex 5fd0b5c59..bef53af8d 100644--- a/frontend/src/locales/pl.js+++ b/frontend/src/locales/pl.js@@ -493,7 +493,6 @@ export default {'lower legs': 'łydki', 'neck': 'kark', 'shoulders': 'barki','upper arms': 'ramiona', 'upper legs': 'uda', 'waist': 'brzuch','full body': 'całe ciało',- 'Details': 'Szczegóły','Finish': 'Zakończ','Start {0}': 'Zacznij {0}','Guest mode: your data lives only in this browser.': 'Tryb gościa: Twoje dane są tylko w tej przeglądarce.',@@ -1238,7 +1237,6 @@ export default {'What should change?': 'Co powinno się zmienić?','Coach is thinking…': 'Trener myśli…','Message the Coach…': 'Napisz do trenera…',- 'Open progression settings': 'Otwórz ustawienia progresji','Hevy is rate-limiting requests. Wait a minute and try again': 'Hevy ogranicza liczbę zapytań. Odczekaj minutę i spróbuj ponownie',// --- log a past workout ---'Log a past workout': 'Zapisz miniony trening',@@ -1327,7 +1325,6 @@ export default {'Camera access was denied. Allow it in your browser and try again.': 'Odmówiono dostępu do aparatu. Zezwól na niego w przeglądarce i spróbuj ponownie.','Add note': 'Dodaj notatkę','Edit note': 'Edytuj notatkę',- 'Progression settings': 'Ustawienia progresji','Don’t count for progression': 'Nie wliczaj do progresji','This exercise, this session only': 'Tylko to ćwiczenie, tylko w tej sesji','Not counted for progression': 'Nie wlicza się do progresji',@@ -1710,7 +1707,6 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Zaktualizuj plan','Update “{0}”?': 'Zaktualizować plan „{0}”?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Kopiuje do planu serie rozgrzewkowe tego ćwiczenia oraz przerwę i notatkę z jego Ustawień progresji. Notatka dodana na dziś zostaje przy tym treningu. Twoja historia treningów zostaje bez zmian.','Routine updated': 'Plan zaktualizowany','per side': 'na stronę','Left': 'Lewa',@@ -1874,4 +1870,14 @@ export default {'Workout settings': 'Ustawienia treningu','Default ({0})': 'Domyślnie ({0})','Rest for this exercise': 'Przerwa dla tego ćwiczenia',+ 'Add to this set': 'Dodaj do tej serii',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Kopiuje do planu serie rozgrzewkowe tego ćwiczenia oraz przerwę i notatkę z jego Ustawień ćwiczenia. Notatka dodana na dziś zostaje przy tym treningu. Twoja historia treningów zostaje bez zmian.',+ 'Discard workout': 'Odrzuć trening',+ 'Exercise settings': 'Ustawienia ćwiczenia',+ 'How to do it': 'Jak to zrobić',+ 'Look it up': 'Do sprawdzenia',+ 'Open exercise settings': 'Otwórz ustawienia ćwiczenia',+ 'Order and supersets': 'Kolejność i superserie',+ 'Sets, reps, rest, progression': 'Serie, powt., przerwa, progresja',+ 'This workout': 'Ten trening',}diff --git a/frontend/src/locales/pt-BR.js b/frontend/src/locales/pt-BR.jsindex 9b70c2a7b..f3c529789 100644--- a/frontend/src/locales/pt-BR.js+++ b/frontend/src/locales/pt-BR.js@@ -4,6 +4,16 @@import pt from './pt.js'export const PT_BR_OVERRIDES = {+ 'Add to this set': 'Adicionar a esta série',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Copia para a rotina as séries de aquecimento deste exercício, e o descanso e a anotação das Configurações do exercício dele. Uma anotação adicionada para hoje fica com este treino. Seu histórico de treinos é mantido.',+ 'Discard workout': 'Descartar treino',+ 'Exercise settings': 'Configurações do exercício',+ 'How to do it': 'Como fazer',+ 'Look it up': 'Consultar',+ 'Open exercise settings': 'Abrir configurações do exercício',+ 'Order and supersets': 'Ordem e supersets',+ 'Sets, reps, rest, progression': 'Séries, reps, descanso, progressão',+ 'This workout': 'Este treino','Default ({0})': 'Padrão ({0})','Rest for this exercise': 'Descanso deste exercício','All settings': 'Todas as configurações',@@ -719,7 +729,6 @@ export const PT_BR_OVERRIDES = {// --- per-exercise rest ---'Rest after each set of this exercise. Leave at 0 to use your default rest timer.': 'Descanso depois de cada série deste exercício. Deixe em 0 para usar o temporizador de descanso padrão.',- 'Open progression settings': 'Abrir configurações de progressão','Hevy is rate-limiting requests. Wait a minute and try again': 'O Hevy está limitando as solicitações. Espere um minuto e tente de novo','Log a past workout': 'Registrar um treino passado','Logged on the usual workout screen, without timers.': 'Registrado na tela de treino habitual, só sem temporizadores.',@@ -780,7 +789,6 @@ export const PT_BR_OVERRIDES = {'Clear selection': 'Limpar seleção','Primary target': 'Músculo principal','Also trains': 'Também trabalha',- 'Progression settings': 'Configurações de progressão','Off: tap the number and type it': 'Desligado: toque no número e digite','Move, swap and remove buttons below the exercise': 'Botões mover, trocar e remover abaixo do exercício','Everything hidden here stays one tap away: the ⋯ button of an exercise and the number of a set.': 'Tudo o que você esconde aqui fica a um toque: o botão ⋯ de um exercício e o número de uma série.',@@ -1052,7 +1060,6 @@ export const PT_BR_OVERRIDES = {// --- update a routine from a running workout ---'Update routine': 'Atualizar rotina','Update “{0}”?': 'Atualizar “{0}”?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Copia para a rotina as séries de aquecimento deste exercício, e o descanso e a anotação das Configurações de progressão dele. Uma anotação adicionada para hoje fica com este treino. Seu histórico de treinos é mantido.','Routine updated': 'Rotina atualizada','{0} set becomes {1}: one on each side, {2}s held every time.': '{0} série vira {1}: uma de cada lado, {2} s de isometria cada vez.','{0} sets become {1}: one on each side, {2}s held every time.': '{0} séries viram {1}: uma de cada lado, {2} s de isometria cada vez.',diff --git a/frontend/src/locales/pt.js b/frontend/src/locales/pt.jsindex 717d836fe..26eef1d50 100644--- a/frontend/src/locales/pt.js+++ b/frontend/src/locales/pt.js@@ -493,7 +493,6 @@ export default {'lower legs': 'gémeos', 'neck': 'pescoço', 'shoulders': 'ombros','upper arms': 'braços', 'upper legs': 'pernas', 'waist': 'abdómen','full body': 'corpo inteiro',- 'Details': 'Detalhes','Finish': 'Terminar','Start {0}': 'Começar {0}','Guest mode: your data lives only in this browser.': 'Modo convidado: os teus dados vivem só neste navegador.',@@ -1238,7 +1237,6 @@ export default {'What should change?': 'O que deve mudar?','Coach is thinking…': 'O Coach está a pensar…','Message the Coach…': 'Escreve ao Coach…',- 'Open progression settings': 'Abrir definições de progressão','Hevy is rate-limiting requests. Wait a minute and try again': 'O Hevy está a limitar os pedidos. Espera um minuto e tenta de novo',// --- log a past workout ---'Log a past workout': 'Registar um treino passado',@@ -1327,7 +1325,6 @@ export default {'Camera access was denied. Allow it in your browser and try again.': 'O acesso à câmara foi recusado. Permite-o no navegador e tenta de novo.','Add note': 'Adicionar nota','Edit note': 'Editar nota',- 'Progression settings': 'Definições de progressão','Don’t count for progression': 'Não contar para a progressão','This exercise, this session only': 'Só este exercício, só nesta sessão','Not counted for progression': 'Não conta para a progressão',@@ -1710,7 +1707,6 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Atualizar rotina','Update “{0}”?': 'Atualizar «{0}»?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Copia para a rotina as séries de aquecimento deste exercício, e o descanso e a nota das suas Definições de progressão. Uma nota adicionada para hoje fica com este treino. O teu histórico de treinos é mantido.','Routine updated': 'Rotina atualizada','per side': 'por lado','Left': 'Esquerda',@@ -1874,4 +1870,14 @@ export default {'Workout settings': 'Definições do treino','Default ({0})': 'Predefinição ({0})','Rest for this exercise': 'Descanso deste exercício',+ 'Add to this set': 'Adicionar a esta série',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Copia para a rotina as séries de aquecimento deste exercício, e o descanso e a nota das suas Definições do exercício. Uma nota adicionada para hoje fica com este treino. O teu histórico de treinos é mantido.',+ 'Discard workout': 'Descartar treino',+ 'Exercise settings': 'Definições do exercício',+ 'How to do it': 'Como se faz',+ 'Look it up': 'Consultar',+ 'Open exercise settings': 'Abrir definições do exercício',+ 'Order and supersets': 'Ordem e supersets',+ 'Sets, reps, rest, progression': 'Séries, reps, descanso, progressão',+ 'This workout': 'Este treino',}diff --git a/frontend/src/locales/ru.js b/frontend/src/locales/ru.jsindex a37e44420..d889039eb 100644--- a/frontend/src/locales/ru.js+++ b/frontend/src/locales/ru.js@@ -483,7 +483,6 @@ export default {'lower legs': 'голени', 'neck': 'шея', 'shoulders': 'плечи','upper arms': 'руки', 'upper legs': 'бёдра', 'waist': 'пресс','full body': 'всё тело',- 'Details': 'Детали','Finish': 'Завершить','Start {0}': 'Начать {0}','Guest mode: your data lives only in this browser.': 'Гостевой режим: данные хранятся только в этом браузере.',@@ -1209,7 +1208,6 @@ export default {'What should change?': 'Что изменить?','Coach is thinking…': 'Тренер думает…','Message the Coach…': 'Написать тренеру…',- 'Open progression settings': 'Открыть настройки прогрессии','Hevy is rate-limiting requests. Wait a minute and try again': 'Hevy ограничивает запросы. Подождите минуту и попробуйте снова',// --- log a past workout ---'Log a past workout': 'Записать прошлую тренировку',@@ -1298,7 +1296,6 @@ export default {'Camera access was denied. Allow it in your browser and try again.': 'Доступ к камере запрещён. Разрешите его в браузере и попробуйте снова.','Add note': 'Добавить заметку','Edit note': 'Изменить заметку',- 'Progression settings': 'Настройки прогрессии','Don’t count for progression': 'Не учитывать в прогрессии','This exercise, this session only': 'Только это упражнение и только в этой тренировке','Not counted for progression': 'Не учитывается в прогрессии',@@ -1714,7 +1711,6 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Обновить программу','Update “{0}”?': 'Обновить программу «{0}»?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Копирует в программу разминочные подходы этого упражнения, а также отдых и заметку из его настроек прогрессии. Заметка на сегодня остаётся с этой тренировкой. История тренировок сохраняется.','Routine updated': 'Программа обновлена','per side': 'на сторону','Left': 'Левая',@@ -1878,4 +1874,14 @@ export default {'Workout settings': 'Настройки тренировки','Default ({0})': 'По умолчанию ({0})','Rest for this exercise': 'Отдых для этого упражнения',+ 'Add to this set': 'Добавить к этому подходу',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Копирует в программу разминочные подходы этого упражнения, а также отдых и заметку из его настроек упражнения. Заметка на сегодня остаётся с этой тренировкой. История тренировок сохраняется.',+ 'Discard workout': 'Отменить тренировку',+ 'Exercise settings': 'Настройки упражнения',+ 'How to do it': 'Как выполнять',+ 'Look it up': 'Справка',+ 'Open exercise settings': 'Открыть настройки упражнения',+ 'Order and supersets': 'Порядок и суперсеты',+ 'Sets, reps, rest, progression': 'Подходы, повторы, отдых, прогрессия',+ 'This workout': 'Эта тренировка',}diff --git a/frontend/src/locales/th.js b/frontend/src/locales/th.jsindex 6d3ac7b29..77d60d2df 100644--- a/frontend/src/locales/th.js+++ b/frontend/src/locales/th.js@@ -496,7 +496,6 @@ export default {'upper arms': 'แขนท่อนบน', 'upper legs': 'ขาท่อนบน', 'waist': 'เอว','full body': 'ทั้งตัว',// --- data terms: equipment ---- 'Details': 'รายละเอียด','Finish': 'เสร็จสิ้น','Start {0}': 'เริ่ม {0}','Guest mode: your data lives only in this browser.': 'โหมดผู้เยี่ยมชม: ข้อมูลของคุณอยู่ในเบราว์เซอร์นี้เท่านั้น',@@ -914,7 +913,6 @@ export default {'Deload routine': 'รูทีนดีโหลด','Its workouts do not count toward progression. They still show in history and statistics.': 'การฝึกของรูทีนนี้ไม่นับรวมในการเพิ่มระดับ แต่ยังแสดงในประวัติและสถิติ','A deload routine opens at the numbers set here, so the progression above does not apply to it.': 'รูทีนดีโหลดเริ่มจากค่าที่ตั้งไว้ที่นี่ การเพิ่มระดับด้านบนจึงไม่มีผลกับรูทีนนี้',- 'Open progression settings': 'เปิดการตั้งค่าการเพิ่มน้ำหนัก','Hevy is rate-limiting requests. Wait a minute and try again': 'Hevy กำลังจำกัดจำนวนคำขอ รอสักนาทีแล้วลองอีกครั้ง',// --- log a past workout ---'Log a past workout': 'บันทึกการฝึกย้อนหลัง',@@ -1338,7 +1336,6 @@ export default {'Camera access was denied. Allow it in your browser and try again.': 'การเข้าถึงกล้องถูกปฏิเสธ อนุญาตในเบราว์เซอร์แล้วลองอีกครั้ง','Add note': 'เพิ่มโน้ต','Edit note': 'แก้ไขโน้ต',- 'Progression settings': 'ตั้งค่าการเพิ่มน้ำหนัก','Don’t count for progression': 'ไม่นับรวมในการเพิ่มระดับ','This exercise, this session only': 'เฉพาะท่านี้ และเฉพาะรอบนี้เท่านั้น','Not counted for progression': 'ไม่ถูกนับรวมในการเพิ่มระดับ',@@ -1721,7 +1718,6 @@ export default {// --- update a routine from a running workout ---'Update routine': 'อัปเดตรูทีน','Update “{0}”?': 'อัปเดตรูทีน “{0}” ไหม?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'คัดลอกเซ็ตวอร์มอัพของท่านี้ รวมถึงเวลาพักและโน้ตจากการตั้งค่าการเพิ่มน้ำหนัก ไปยังรูทีน โน้ตที่เพิ่มไว้สำหรับวันนี้จะอยู่กับการออกกำลังกายครั้งนี้ ประวัติการออกกำลังกายของคุณจะยังอยู่ครบ','Routine updated': 'อัปเดตรูทีนแล้ว','per side': 'ต่อข้าง','Left': 'ซ้าย',@@ -1885,4 +1881,14 @@ export default {'Workout settings': 'ตั้งค่าระหว่างออกกำลังกาย','Default ({0})': 'ค่าเริ่มต้น ({0})','Rest for this exercise': 'เวลาพักของท่านี้',+ 'Add to this set': 'เพิ่มในเซ็ตนี้',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'คัดลอกเซ็ตวอร์มอัพของท่านี้ รวมถึงเวลาพักและโน้ตจากการตั้งค่าท่าออกกำลังกาย ไปยังรูทีน โน้ตที่เพิ่มไว้สำหรับวันนี้จะอยู่กับการออกกำลังกายครั้งนี้ ประวัติการออกกำลังกายของคุณจะยังอยู่ครบ',+ 'Discard workout': 'ทิ้งการออกกำลังกายนี้',+ 'Exercise settings': 'ตั้งค่าท่าออกกำลังกาย',+ 'How to do it': 'วิธีทำ',+ 'Look it up': 'ดูข้อมูล',+ 'Open exercise settings': 'เปิดการตั้งค่าท่าออกกำลังกาย',+ 'Order and supersets': 'ลำดับและซูเปอร์เซ็ต',+ 'Sets, reps, rest, progression': 'เซ็ต ครั้ง เวลาพัก การเพิ่มน้ำหนัก',+ 'This workout': 'การออกกำลังกายครั้งนี้',}diff --git a/frontend/src/locales/tr.js b/frontend/src/locales/tr.jsindex 4e16ae18f..6daacf677 100644--- a/frontend/src/locales/tr.js+++ b/frontend/src/locales/tr.js@@ -493,7 +493,6 @@ export default {'lower legs': 'baldırlar', 'neck': 'boyun', 'shoulders': 'omuzlar','upper arms': 'üst kollar', 'upper legs': 'bacaklar', 'waist': 'karın','full body': 'tüm vücut',- 'Details': 'Ayrıntılar','Finish': 'Bitir','Start {0}': '{0} başlat','Guest mode: your data lives only in this browser.': 'Misafir modu: verilerin yalnızca bu tarayıcıda yaşar.',@@ -1238,7 +1237,6 @@ export default {'What should change?': 'Ne değişmeli?','Coach is thinking…': 'Koç düşünüyor…','Message the Coach…': 'Koça yaz…',- 'Open progression settings': 'İlerleme ayarlarını aç','Hevy is rate-limiting requests. Wait a minute and try again': 'Hevy istekleri sınırlıyor. Bir dakika bekleyip tekrar deneyin',// --- log a past workout ---'Log a past workout': 'Geçmiş bir antrenman kaydet',@@ -1327,7 +1325,6 @@ export default {'Camera access was denied. Allow it in your browser and try again.': 'Kamera erişimi reddedildi. Tarayıcıda izin verip tekrar deneyin.','Add note': 'Not ekle','Edit note': 'Notu düzenle',- 'Progression settings': 'İlerleme ayarları','Don’t count for progression': 'İlerlemeye sayma','This exercise, this session only': 'Yalnızca bu egzersiz, yalnızca bu seansta','Not counted for progression': 'İlerlemeye sayılmaz',@@ -1710,7 +1707,6 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Rutini güncelle','Update “{0}”?': '“{0}” rutini güncellensin mi?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Bu egzersizin ısınma setlerini ve İlerleme ayarlarındaki dinlenme süresi ile notu rutine kopyalar. Bugün için eklenen not bu antrenmanda kalır. Antrenman geçmişin korunur.','Routine updated': 'Rutin güncellendi','per side': 'taraf başına','Left': 'Sol',@@ -1874,4 +1870,14 @@ export default {'Workout settings': 'Antrenman ayarları','Default ({0})': 'Varsayılan ({0})','Rest for this exercise': 'Bu egzersizin dinlenmesi',+ 'Add to this set': 'Bu sete ekle',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Bu egzersizin ısınma setlerini ve Egzersiz ayarlarındaki dinlenme süresi ile notu rutine kopyalar. Bugün için eklenen not bu antrenmanda kalır. Antrenman geçmişin korunur.',+ 'Discard workout': 'Antrenmanı iptal et',+ 'Exercise settings': 'Egzersiz ayarları',+ 'How to do it': 'Nasıl yapılır',+ 'Look it up': 'Göz at',+ 'Open exercise settings': 'Egzersiz ayarlarını aç',+ 'Order and supersets': 'Sıra ve süper setler',+ 'Sets, reps, rest, progression': 'Setler, tekrarlar, dinlenme, ilerleme',+ 'This workout': 'Bu antrenman',}diff --git a/frontend/src/locales/uk.js b/frontend/src/locales/uk.jsindex 683d02928..3697e4582 100644--- a/frontend/src/locales/uk.js+++ b/frontend/src/locales/uk.js@@ -330,7 +330,6 @@ export default {'lower legs': 'гомілки', 'neck': 'шия', 'shoulders': 'плечі','upper arms': 'руки', 'upper legs': 'стегна', 'waist': 'прес','full body': 'усе тіло',- 'Details': 'Деталі','Finish': 'Завершити','Start {0}': 'Почати {0}','Guest mode: your data lives only in this browser.': 'Гостьовий режим: дані живуть лише в цьому браузері.',@@ -1042,7 +1041,6 @@ export default {'What should change?': 'Що змінити?','Coach is thinking…': 'Тренер думає…','Message the Coach…': 'Написати тренеру…',- 'Open progression settings': 'Відкрити налаштування прогресії','Hevy is rate-limiting requests. Wait a minute and try again': 'Hevy обмежує кількість запитів. Зачекай хвилину і спробуй знову',// --- log a past workout ---'Log a past workout': 'Записати минуле тренування',@@ -1179,7 +1177,6 @@ export default {"Scan or import a code first": "Спочатку відскануй або імпортуй код","Add note": "Додати нотатку","Edit note": "Змінити нотатку",- "Progression settings": "Налаштування прогресії","Set {0}": "Підхід {0}","Drop set": "Дроп-сет","Rest-pause burst": "Серія рест-паузи",@@ -1707,7 +1704,6 @@ export default {// --- update a routine from a running workout ---'Update routine': 'Оновити програму','Update “{0}”?': 'Оновити програму «{0}»?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Копіює до програми розминкові підходи цієї вправи, а також відпочинок і нотатку з її налаштувань прогресії. Нотатка на сьогодні залишається з цим тренуванням. Історія тренувань зберігається.','Routine updated': 'Програму оновлено','per side': 'на сторону','Left': 'Ліва',@@ -1871,4 +1867,14 @@ export default {'Workout settings': 'Налаштування тренування','Default ({0})': 'Типово ({0})','Rest for this exercise': 'Відпочинок для цієї вправи',+ 'Add to this set': 'Додати до цього підходу',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': 'Копіює до програми розминкові підходи цієї вправи, а також відпочинок і нотатку з її налаштувань вправи. Нотатка на сьогодні залишається з цим тренуванням. Історія тренувань зберігається.',+ 'Discard workout': 'Скасувати тренування',+ 'Exercise settings': 'Налаштування вправи',+ 'How to do it': 'Як виконувати',+ 'Look it up': 'Довідка',+ 'Open exercise settings': 'Відкрити налаштування вправи',+ 'Order and supersets': 'Порядок і суперсети',+ 'Sets, reps, rest, progression': 'Підходи, повтори, відпочинок, прогресія',+ 'This workout': 'Це тренування',}diff --git a/frontend/src/locales/zh-TW.js b/frontend/src/locales/zh-TW.jsindex 3d759a031..ddafd484d 100644--- a/frontend/src/locales/zh-TW.js+++ b/frontend/src/locales/zh-TW.js@@ -488,7 +488,6 @@ export default {'lower legs': '小腿', 'neck': '頸部', 'shoulders': '肩膀','upper arms': '上臂', 'upper legs': '大腿', 'waist': '腰腹','full body': '全身',- 'Details': '詳細內容','Finish': '結束','Start {0}': '開始 {0}','Guest mode: your data lives only in this browser.': '訪客模式:你的資料只儲存在此瀏覽器中。',@@ -1230,7 +1229,6 @@ export default {'What should change?': '想要調整什麼?','Coach is thinking…': '教練思考中…','Message the Coach…': '傳訊息給教練…',- 'Open progression settings': '開啟漸進規則設定','Hevy is rate-limiting requests. Wait a minute and try again': 'Hevy 正在限制請求頻率。請等一分鐘後再試',// --- log a past workout ---'Log a past workout': '補記過去的訓練',@@ -1318,7 +1316,6 @@ export default {'Camera access was denied. Allow it in your browser and try again.': '相機存取權限遭拒。請在瀏覽器中允許後再試。','Add note': '新增備註','Edit note': '編輯備註',- 'Progression settings': '漸進超負荷設定','Don’t count for progression': '不計入漸進加重依據','This exercise, this session only': '僅限此動作,且僅限本次訓練','Not counted for progression': '未列入漸進超負荷考量',@@ -1686,7 +1683,6 @@ export default {'No muscle volume planned.': '尚未排定肌肉訓練量。','Update routine': '更新課表','Update “{0}”?': '要更新課表「{0}」嗎?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': '將此動作的熱身組,以及其漸進超負荷設定中的休息時間與備忘錄,複製到課表中。為今天新增的備忘錄會留在這次訓練中。你的訓練紀錄會保留。','Routine updated': '課表已更新','per side': '每側','Left': '左側',@@ -1867,4 +1863,14 @@ export default {'Workout settings': '訓練設定','Default ({0})': '預設({0})','Rest for this exercise': '此動作的組間休息',+ 'Add to this set': '加到這一組',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': '將此動作的熱身組,以及其動作設定中的休息時間與備忘錄,複製到課表中。為今天新增的備忘錄會留在這次訓練中。你的訓練紀錄會保留。',+ 'Discard workout': '捨棄本次訓練',+ 'Exercise settings': '動作設定',+ 'How to do it': '動作要領',+ 'Look it up': '查看',+ 'Open exercise settings': '開啟動作設定',+ 'Order and supersets': '順序與超級組',+ 'Sets, reps, rest, progression': '組數、次數、休息、漸進',+ 'This workout': '本次訓練',}diff --git a/frontend/src/locales/zh.js b/frontend/src/locales/zh.jsindex 95ca44b04..a1219e2ba 100644--- a/frontend/src/locales/zh.js+++ b/frontend/src/locales/zh.js@@ -493,7 +493,6 @@ export default {'lower legs': '小腿', 'neck': '颈部', 'shoulders': '肩部','upper arms': '上臂', 'upper legs': '大腿', 'waist': '腰腹','full body': '全身',- 'Details': '详情','Finish': '结束','Start {0}': '开始 {0}','Guest mode: your data lives only in this browser.': '访客模式:你的数据只保存在此浏览器中。',@@ -1238,7 +1237,6 @@ export default {'What should change?': '需要改什么?','Coach is thinking…': '教练思考中…','Message the Coach…': '给教练留言…',- 'Open progression settings': '打开进阶设置','Hevy is rate-limiting requests. Wait a minute and try again': 'Hevy 正在限制请求频率。请等一分钟后重试',// --- log a past workout ---'Log a past workout': '补记过去的训练',@@ -1327,7 +1325,6 @@ export default {'Camera access was denied. Allow it in your browser and try again.': '摄像头访问被拒绝。请在浏览器中允许后重试。','Add note': '添加备注','Edit note': '编辑备注',- 'Progression settings': '渐进设置','Don’t count for progression': '不计入进阶','This exercise, this session only': '仅限此动作,仅限本次训练','Not counted for progression': '未计入进阶',@@ -1710,7 +1707,6 @@ export default {// --- update a routine from a running workout ---'Update routine': '更新训练日','Update “{0}”?': '更新训练日「{0}」?',- 'Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': '将该动作的热身组,以及其渐进设置中的休息时间和备注,复制到训练日中。为今天添加的备注会留在本次训练中。训练历史会保留。','Routine updated': '训练日已更新','per side': '每侧','Left': '左侧',@@ -1874,4 +1870,14 @@ export default {'Workout settings': '训练设置','Default ({0})': '默认({0})','Rest for this exercise': '本动作的休息',+ 'Add to this set': '添加到这一组',+ 'Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.': '将该动作的热身组,以及其动作设置中的休息时间和备注,复制到训练日中。为今天添加的备注会留在本次训练中。训练历史会保留。',+ 'Discard workout': '放弃训练',+ 'Exercise settings': '动作设置',+ 'How to do it': '动作要领',+ 'Look it up': '查看',+ 'Open exercise settings': '打开动作设置',+ 'Order and supersets': '顺序与超级组',+ 'Sets, reps, rest, progression': '组数、次数、休息、渐进',+ 'This workout': '本次训练',}diff --git a/frontend/src/views/Workout.jsx b/frontend/src/views/Workout.jsxindex 4a69332f0..a8b87dbea 100644--- a/frontend/src/views/Workout.jsx+++ b/frontend/src/views/Workout.jsx@@ -17,6 +17,10 @@ import { api, beacon } from '../lib/api.js'import { pyramidRestFor, maxRecordAt, isPyramid, pyramidLabel } from '../lib/pyramid.js'import { insertionIndexAfterCurrentUnit, nextUnfinishedUnit, setProgressHighWater, supersetFlowStep, restAfterSet, restOnRecheck, restSecFor, warmupRestSecFor } from '../lib/supersetFlow.js'import Media from '../components/Media.jsx'+import WorkoutThumb, { hasWorkoutMedia } from '../components/WorkoutThumb.jsx'+import { workoutSettingsSheet } from '../components/WorkoutSettingsSheet.jsx'+import { durationSheet } from '../components/DurationWheel.jsx'+import { REST_MAX, fmtRest } from '../lib/duration.js'import { startFlow, exercisePicker, exConfigSheet, exerciseDetailSheet, finishWorkout, exitWorkoutEdit, workoutCompleteSheet, confirmSheet, exerciseNoteSheet, sessionNoteSheet, renameWorkoutSheet, swapActiveWorkoutExercise, barWeightSheet, menuSheet, effortPickerSheet, exerciseHistorySheet, addRoutineToSessionSheet } from '../sheets.jsx'import { afterScrollRestore, scrollRestorePending } from '../components/Modals.jsx'import { effortColor } from '../lib/effort.js'@@ -100,7 +104,7 @@ const RTL_LETTER = /[-ࣿיִ-﷿ﹰ-]/// enough to turn over, far shorter than the rest the set earns once both sides are held.const SWITCH_SIDES_SEC = 10-function ExerciseBlock({ entryIdx, compact, dense, editing, onToggle, onToggleSide, onField, onAddSet, onRemoveSet, onAddWarmup, onRemoveSetAt, onStartTimed, onPairPrev, onPairNext, onSetRowRef, onProgressionSettings, onNoProg, routineUpdate, onSwap, onMoveUp, onMoveDown, canMoveUp, canMoveDown, onRemoveExercise, busy }) {+function ExerciseBlock({ entryIdx, compact, dense, editing, onToggle, onToggleSide, onField, onAddSet, onRemoveSet, onAddWarmup, onRemoveSetAt, onStartTimed, onPairPrev, onPairNext, onSetRowRef, onProgressionSettings, onRest, onNoProg, routineUpdate, onSwap, onMoveUp, onMoveDown, canMoveUp, canMoveDown, onRemoveExercise, busy }) {const S = useStore(s => s.S)const update = useStore(s => s.update)const working = useUI(s => s.work)@@ -162,6 +166,7 @@ function ExerciseBlock({ entryIdx, compact, dense, editing, onToggle, onToggleSireturn { ...setClusterAt(row, ci, { r: v }), r: Math.max(0, (row.r || 0) + delta) }})const ex = exOr(entry.id)+ const thumb = !dense && S.gifSize === 'mini' && hasWorkoutMedia(ex)const mode = modeOf({ ...(entry.target || {}), id: entry.id })const cardio = mode === 'cardio'const timed = mode === 'time'@@ -356,25 +361,41 @@ function ExerciseBlock({ entryIdx, compact, dense, editing, onToggle, onToggleSi}// Everything about this exercise that is not a set you are logging right now lives behind one// button. What used to be a row of buttons in the header, a chip under the bar, a strip of- // three under the sets and four more below the card is a single list you open once a session.+ // three under the sets and four more below the card is a single list you open once a session,+ // in groups since v1.3.11: what you change today, what you look up, the exercise's settings,+ // the order of the session, and Remove on its own at the end.+ // The exercise's own rest, or the default it falls back to (lib/supersetFlow.js restSecFor).+ const ownRest = entry.target?.restSec > 0 ? entry.target.restSec : 0+ const restSub = ownRest ? fmtRest(ownRest) : t('Default ({0})', fmtRest(S.restSec))const openMore = () => menuSheet({title: exerciseNameFor(ex),titleClass: exerciseNameClass(ex),- items: [- { icon: 'pencil', label: entry.note ? t('Edit note') : t('Add note'), sub: entry.note || undefined, onClick: () => exerciseNoteSheet(entryIdx) },- { icon: 'info', label: t('Details'), onClick: () => exerciseDetailSheet(ex) },- { icon: 'history', label: t('History'), sub: last ? t('Last time') + ' ' + fmtDate(last.d) : undefined, onClick: () => exerciseHistorySheet(entry.id) },- onProgressionSettings && { icon: 'chartLine', label: t('Progression settings'), sub: guidance ? t(guidance.policyLabel) : undefined, onClick: onProgressionSettings },- onNoProg && { icon: 'pause', label: t('Don’t count for progression'), sub: t('This exercise, this session only'), on: entry.noProg === true, onClick: () => onNoProg(entry.noProg !== true) },- plateLoading && { icon: 'plate', label: t('Plate loading'), sub: loadSummary, onClick: () => barWeightSheet(entry.id, cfg) },- { icon: 'flame', label: t('Add warm-up set'), onClick: onAddWarmup },- routineUpdate && { icon: 'upload', label: t('Update routine'), sub: routineUpdate.sub, onClick: routineUpdate.run },- onPairPrev && { icon: 'link', label: t('Make superset with previous'), onClick: onPairPrev },- onPairNext && { icon: 'link', label: t('Make superset with next'), onClick: onPairNext },- onSwap && { icon: 'shuffle', label: t('Swap exercise'), onClick: onSwap, disabled: busy },- onMoveUp && { icon: 'chevronUp', label: t('Move up'), onClick: onMoveUp, disabled: busy || !canMoveUp },- onMoveDown && { icon: 'chevronDown', label: t('Move down'), onClick: onMoveDown, disabled: busy || !canMoveDown },- onRemoveExercise && { icon: 'trash', label: t('Remove exercise'), onClick: onRemoveExercise, danger: true, disabled: busy },+ sections: [+ { title: t('Today'), items: [+ onSwap && { icon: 'swap', label: t('Swap exercise'), onClick: onSwap, disabled: busy },+ { icon: 'sunrise', label: t('Add warm-up set'), onClick: onAddWarmup },+ { icon: 'note', label: entry.note ? t('Edit note') : t('Add note'), sub: entry.note || undefined, onClick: () => exerciseNoteSheet(entryIdx) },+ onNoProg && { icon: 'chartLineSlash', label: t('Don’t count for progression'), sub: t('This exercise, this session only'), on: entry.noProg === true, onClick: () => onNoProg(entry.noProg !== true) },+ ] },+ { title: t('Look it up'), items: [+ { icon: 'history', label: t('History'), sub: last ? t('Last time') + ' ' + fmtDate(last.d) : undefined, onClick: () => exerciseHistorySheet(entry.id) },+ { icon: 'info', label: t('How to do it'), onClick: () => exerciseDetailSheet(ex) },+ ] },+ { title: t('Settings'), items: [+ onProgressionSettings && { icon: 'slider', label: t('Exercise settings'), sub: guidance ? t(guidance.policyLabel) : t('Sets, reps, rest, progression'), onClick: onProgressionSettings },+ onRest && { icon: 'timer', label: t('Rest timer'), sub: restSub, onClick: onRest },+ plateLoading && { icon: 'plate', label: t('Plate loading'), sub: loadSummary, onClick: () => barWeightSheet(entry.id, cfg) },+ routineUpdate && { icon: 'upload', label: t('Update routine'), sub: routineUpdate.sub, onClick: routineUpdate.run },+ ] },+ { title: t('Order and supersets'), items: [+ onPairPrev && { icon: 'link', label: t('Make superset with previous'), onClick: onPairPrev },+ onPairNext && { icon: 'link', label: t('Make superset with next'), onClick: onPairNext },+ onMoveUp && { icon: 'chevronUp', label: t('Move up'), onClick: onMoveUp, disabled: busy || !canMoveUp },+ onMoveDown && { icon: 'chevronDown', label: t('Move down'), onClick: onMoveDown, disabled: busy || !canMoveDown },+ ] },+ { items: [+ onRemoveExercise && { icon: 'trash', label: t('Remove exercise'), onClick: onRemoveExercise, danger: true, disabled: busy },+ ] },],})// The set number is the set's own menu: drop / burst / remove — three things that used to@@ -394,10 +415,14 @@ function ExerciseBlock({ entryIdx, compact, dense, editing, onToggle, onToggleSimenuSheet({title: warm ? t('Warm-up') : sideTag ? t('Set {0} ({1})', setNumOf(s, i), sideTag) : t('Set {0}', setNumOf(s, i)),subtitle: setLabel(entry.id, s, entry.target, speedUnit),- items: [- !warm && mode === 'reps' && !isRestPauseSet(s) && { icon: 'arrowDown', label: t('Drop set'), sub: t('+ Drop'), onClick: () => addDropRow(i) },- !warm && mode === 'reps' && !isDropSet(s) && { icon: 'bolt', label: t('Rest-pause burst'), sub: t('+ Burst'), onClick: () => addBurstRow(i) },- { icon: 'trash', label: t('Remove this set'), danger: true, disabled: !editing && entry.sets.length <= 1, onClick: () => onRemoveSetAt(i) },+ sections: [+ { title: t('Add to this set'), items: [+ !warm && mode === 'reps' && !isRestPauseSet(s) && { icon: 'arrowDown', label: t('Drop set'), sub: t('+ Drop'), onClick: () => addDropRow(i) },+ !warm && mode === 'reps' && !isDropSet(s) && { icon: 'bolt', label: t('Rest-pause burst'), sub: t('+ Burst'), onClick: () => addBurstRow(i) },+ ] },+ { items: [+ { icon: 'trash', label: t('Remove this set'), danger: true, disabled: !editing && entry.sets.length <= 1, onClick: () => onRemoveSetAt(i) },+ ] },],})}@@ -522,9 +547,12 @@ function ExerciseBlock({ entryIdx, compact, dense, editing, onToggle, onToggleSi</div>)return <>- {!dense && <Media ex={ex} key={entry.id} compact={compact} minimizable />}- <div className="row between" style={{ marginBottom: 6 }}>- <div style={{ fontSize: (compact || dense) ? 17 : 20, fontWeight: 600, letterSpacing: '-.02em', lineHeight: 1.2 }} className={exerciseNameClass(ex)}>{exerciseNameFor(ex)}</div>+ {/* Animations set to Small: a thumbnail beside the name instead of a strip above it, so the+ first set is on screen without scrolling; a tap brings the full animation back. */}+ {!dense && !thumb && <Media ex={ex} key={entry.id} compact={compact} minimizable />}+ <div className="row between exhd" style={{ marginBottom: 6 }}>+ {thumb && <WorkoutThumb ex={ex} onExpand={() => update(s => { s.gifSize = 'full' })} />}+ <div style={{ flex: 1, minWidth: 0, fontSize: (compact || dense) ? 17 : 20, fontWeight: 600, letterSpacing: '-.02em', lineHeight: 1.2 }} className={exerciseNameClass(ex)}>{exerciseNameFor(ex)}</div><div className="row" style={{ gap: 2, flex: 'none' }}>{entry.note && <button className="iconbtn" aria-label={t('Note')} title={t('Note')} style={{ color: 'var(--acc)' }}onClick={() => exerciseNoteSheet(entryIdx)}><Icon name="pencil" /></button>}@@ -572,7 +600,7 @@ function ExerciseBlock({ entryIdx, compact, dense, editing, onToggle, onToggleSi{planLine}{refLine}{guidance && onProgressionSettings && <button type="button" className={'progline' + (plan.kind === 'deload' ? ' warn' : '')}- aria-label={t('Open progression settings')} onClick={onProgressionSettings}>+ aria-label={t('Open exercise settings')} onClick={onProgressionSettings}><Icon name={plan.kind === 'up' ? 'arrowUp' : plan.kind === 'deload' ? 'arrowDown' : 'lightbulb'} /><span><strong>{t(guidance.policyLabel)}</strong> · {t(...guidance.why)}</span></button>}@@ -978,7 +1006,7 @@ function ActiveWorkout() {: (c.key === 'warmupSets' ? t('Warm-up sets') : t('Rest (s)')) + ' ' + c.from + ' → ' + c.to).join(' · '),run: () => confirmSheet({title: t('Update “{0}”?', routine.name),- message: t('Copy this exercise’s warm-up sets, and the rest and note from its Progression settings, into the routine. A note added for today stays with this workout. Your workout history is kept.'),+ message: t('Copy this exercise’s warm-up sets, and the rest and note from its Exercise settings, into the routine. A note added for today stays with this workout. Your workout history is kept.'),confirmText: t('Update routine'),onConfirm: () => {let applied = null@@ -1015,6 +1043,7 @@ function ActiveWorkout() {onRemoveSetAt: i => removeSetAt(idx, i),onStartTimed: i => startTimed(idx, i),onProgressionSettings: editing ? null : () => openProgressionSettings(idx),+ onRest: editing ? null : () => openExerciseRest(idx),onNoProg: routineKeepsOut(A.entries[idx]) ? null : on => setNoProg(idx, on),routineUpdate: routineUpdateFor(idx),})@@ -1070,17 +1099,104 @@ function ActiveWorkout() {if (fresh) progressHighWater.current = fresh.entries.map(e => e.sets.filter(s => s.done).length)workoutCompleteSheet()}- // The header ⋮: bring another routine into the session, then the layout switch nested a- // level down (it used to be the whole menu).+ // Adds an exercise after the current unit: the button under the session and the ⋯ menu's Add.+ const addExercise = () => exercisePicker((ex, quick) => {+ // A freehand add inherits the current unit's routine (its `rid`) so it lands in that+ // routine's block in a combined session and gets a real prescription; a routine-less+ // freestyle session has no `rid` to inherit. It inherits the block's `noProg` too: an+ // exercise added to a rehab or deload routine's block is kept out of progression like the+ // rest of it, the way a swap or an edit there is — it takes the routine's own numbers and+ // never becomes the baseline the regular sessions progress from. An exercise kept out by+ // hand (its ⋯ menu) is that exercise's own choice for today and is not passed on; a session+ // kept out as a whole (the header ⋮) takes the new one with it (joinSessionNoProg).+ const curEntry = A.entries[A.cur]+ const curRid = curEntry?.rid+ const routine = curRid ? S.routines.find(r => r.id === curRid) : null+ const freestyle = !routine+ const noProg = !freestyle && builtOutOfProgression(curEntry, routine)+ // Freestyle has no routine prescription to apply: show the last target in the config+ // sheet and carry its completed rows forward. A planned session uses its configured+ // target when progression is off, while progression-enabled sessions keep their path.+ const seed = freestyle ? freestyleConfig(sessionHistory(S), { id: ex.id, ...defaultConfig(ex.id) }) : null+ const commit = cfg => update(s => {+ const full = { ...cfg, id: ex.id }+ // A planned session builds the exercise the way its routine would (prescription, reps+ // source, target); freestyle reproduces what you did last time.+ // Read from before the session's day when it is logged into the past (sessionHistory).+ const past = sessionHistory(s)+ const built = freestyle+ ? { target: { ...cfg }, plan: null, sets: applyIntensifierPlan(buildSets(past, full, {+ step: modeOf(full) === 'reps' ? weightIncrement(full, s.unit) : defaultIncrement(ex.id, s.unit), preferLast: true,+ }), full, dropGrid(s, full)) }+ : buildPlannedEntry(past, full, routine, { noProg })+ const insertAt = insertionIndexAfterCurrentUnit(supersetUnits(s.active.entries), s.active.cur, s.active.entries.length)+ s.active.entries.splice(insertAt, 0, joinSessionNoProg(s.active, { id: ex.id, ...built, ...(curRid ? { rid: curRid } : {}), ...(noProg ? { noProg: true } : {}) }))+ s.active.cur = insertAt+ useUI.getState().shiftRestOwner(insertAt, 1)+ })+ // The "+" on a picker row reads as "add this now" — routed through the same detail+ // sheet before, so it added nothing until you'd scrolled past it and found the real+ // button. Quick-add commits with the same default (or, freestyle, last-session) config+ // the sheet would have opened with; tapping the row still opens that sheet for anyone+ // who wants to set sets/reps first.+ if (quick) { commit(seed || defaultConfig(ex.id)); useUI.getState().toast(t('“{0}” added to {1}', exerciseNameText(ex), routine ? routine.name : t('Freestyle'))) }+ // The confirm names what it changes: this workout, never the routine behind it.+ else exConfigSheet(ex, null, commit, null, routine, seed, null, t('Add to this workout'))+ })+ // Ending the session without saving it. The ⋯ menu's last item since the header's ✕ became the+ // ⌄ that only leaves the screen (v1.3.11).+ const discardWorkout = () => confirmSheet({+ title: t('Discard workout?'), message: t('The sets you logged in this session will be lost.'), confirmText: t('Discard'), danger: true,+ onConfirm: () => { update(s => { s.active = null }); stopRest(); stopWork(); nav('/home') },+ })+ // The header ⋯, in groups: the settings you change at the gym first (their own sheet, the same+ // values as Settings), then what to add, what to change about this workout, and Discard last.+ // Layout here stays this session's own (s.active.workoutView); the settings sheet's Layout is+ // the saved one.const openViewMenu = () => menuSheet({- items: [- A.backfill && A.entries.length > 0 && { icon: 'checkCircle', label: t('Mark all sets done'), onClick: markAllDone },- { icon: 'pencil', label: t('Rename workout'), onClick: renameWorkoutSheet },- !editing && { icon: 'plus', label: t('Add routine'), sub: t('Bring another routine into this session'), onClick: addRoutineToSessionSheet },- noProgSwitchable && { icon: 'pause', label: t('Don’t count for progression'), sub: t('Every exercise in this workout'), on: sessionNoProg(A), onClick: toggleSessionNoProg },- { icon: 'list', label: t('Layout'), sub: LAYOUT_LABEL[workoutView] || LAYOUT_LABEL.cards, onClick: openLayoutMenu },+ sections: [+ { items: [+ { icon: 'gear', accent: true, chevron: true, label: t('Workout settings'),+ sub: [S.restSec > 0 ? t('{0} rest', fmtRest(S.restSec)) : t('No rest timer'), S.sound ? t('Sound') : t('Silent')].join(' · '),+ onClick: workoutSettingsSheet },+ ] },+ { title: t('Add'), items: [+ { icon: 'plusCircle', label: t('Add exercise'), onClick: addExercise },+ !editing && { icon: 'clipboard', label: t('Add routine'), sub: t('Bring another routine into this session'), onClick: addRoutineToSessionSheet },+ ] },+ { title: t('This workout'), items: [+ A.backfill && A.entries.length > 0 && { icon: 'checkCircle', label: t('Mark all sets done'), onClick: markAllDone },+ { icon: 'pencil', label: t('Rename workout'), onClick: renameWorkoutSheet },+ { icon: 'layout', label: t('Layout'), sub: LAYOUT_LABEL[workoutView] || LAYOUT_LABEL.cards, onClick: openLayoutMenu },+ { icon: 'note', label: A.note ? t('Edit session note') : t('Add session note'), onClick: sessionNoteSheet },+ noProgSwitchable && { icon: 'chartLineSlash', label: t('Don’t count for progression'), sub: t('Every exercise in this workout'), on: sessionNoProg(A), onClick: toggleSessionNoProg },+ ] },+ { items: [+ !editing && { icon: 'trash', label: t('Discard workout'), danger: true, onClick: discardWorkout },+ ] },],})+ // An exercise's own rest, from its ⋯ menu: the same wheel as the default rest timer, where 0:00+ // means "no rest of its own", so the default applies. Like everything edited on the exercise+ // from inside the session it is this session's; the menu's Update routine offers to keep it.+ const openExerciseRest = idx => {+ const state = useStore.getState().S+ const entry = state.active?.entries?.[idx]+ if (!entry) return+ const activeId = state.active.id+ const entryId = entry.id+ durationSheet({+ title: t('Rest for this exercise'),+ value: entry.target?.restSec > 0 ? entry.target.restSec : 0, max: REST_MAX,+ off: t('Default ({0})', fmtRest(state.restSec)),+ footer: t('Rest after each set of this exercise. Leave at 0 to use your default rest timer.'),+ onDone: v => update(s => {+ const e = s.active?.id === activeId ? s.active.entries?.[idx] : null+ if (!e || e.id !== entryId) return+ e.target = { ...(e.target || {}), restSec: v }+ }),+ })+ }const openProgressionSettings = idx => {const state = useStore.getState().Sconst entry = state.active?.entries?.[idx]@@ -1412,13 +1528,16 @@ function ActiveWorkout() {set counter, discard/finish, progress) stays pinned — the one thing you want in viewwhile you are somewhere in the middle of a long stack. Cards mode never scrolls far. */}<div className={'whdr' + (listMode ? ' stick' : '')} ref={hdrRef}>- <div className="hdr">- <button className="iconbtn" aria-label={t(editing ? 'Close editor' : 'Discard')} onClick={() => editing ? exitWorkoutEdit() : confirmSheet({ title: t('Discard workout?'), message: t('The sets you logged in this session will be lost.'), confirmText: t('Discard'), danger: true, onConfirm: () => { update(s => { s.active = null }); stopRest(); stopWork(); nav('/home') } })}><Icon name="xmark" /></button>- <div style={{ textAlign: 'center' }}><div style={{ fontWeight: 600 }}>{A.name}</div><div className="sub">{(A.backfill || editing) ? fmtDate(A.d, true) : <Elapsed start={A.start} />} · {t('{0} sets', done + '/' + total)}</div></div>- <div className="row" style={{ gap: 4, flex: 'none' }}>- <button className="iconbtn" aria-label={t('Workout options')} title={t('Workout options')} onClick={openViewMenu}><Icon name="more" /></button>- <button className="iconbtn" style={{ color: 'var(--acc)' }} aria-label={t(editing ? 'Save changes' : 'Finish')} onClick={finishWorkout}><Icon name="check" /></button>- </div>+ {/* ⌄ leaves the screen and keeps the session running (the tab bar's Resume brings it back);+ in the editor of a saved workout it is the ✕ that closes the editor. Discard is in the ⋯+ menu now, and Finish is a labelled pill rather than a check that looked like a set tick. */}+ <div className="hdr whdr-bar">+ {editing+ ? <button className="iconbtn" aria-label={t('Close editor')} title={t('Close editor')} onClick={() => exitWorkoutEdit()}><Icon name="xmark" /></button>+ : <button className="iconbtn" aria-label={t('Minimize')} title={t('Minimize')} onClick={() => nav('/home')}><Icon name="chevronDown" /></button>}+ <div className="whdr-mid"><div className="whdr-name">{A.name}</div><div className="sub">{(A.backfill || editing) ? fmtDate(A.d, true) : <Elapsed start={A.start} />} · {t('{0} sets', done + '/' + total)}</div></div>+ <button className="iconbtn" aria-label={t('Workout options')} title={t('Workout options')} onClick={openViewMenu}><Icon name="more" /></button>+ <button className="btn primary pill whdr-finish" aria-label={editing ? t('Save changes') : undefined} onClick={finishWorkout}>{editing ? t('Save') : t('Finish')}</button></div><div className="wprog"><i style={{ width: (total ? done / total * 100 : 0) + '%' }} /></div></div>@@ -1510,49 +1629,7 @@ function ActiveWorkout() {</div>}{!listMode && <div style={{ height: 10 }} />}{wc.exerciseButtons && listMode && A.entries.length > 0 && <div className="muted small" style={{ marginBottom: 6 }}>{t('Move, swap and remove below act on the exercise marked {0}.', t('Current'))}</div>}- <Button onClick={() => exercisePicker((ex, quick) => {- // A freehand add inherits the current unit's routine (its `rid`) so it lands in that- // routine's block in a combined session and gets a real prescription; a routine-less- // freestyle session has no `rid` to inherit. It inherits the block's `noProg` too: an- // exercise added to a rehab or deload routine's block is kept out of progression like the- // rest of it, the way a swap or an edit there is — it takes the routine's own numbers and- // never becomes the baseline the regular sessions progress from. An exercise kept out by- // hand (its ⋯ menu) is that exercise's own choice for today and is not passed on; a session- // kept out as a whole (the header ⋮) takes the new one with it (joinSessionNoProg).- const curEntry = A.entries[A.cur]- const curRid = curEntry?.rid- const routine = curRid ? S.routines.find(r => r.id === curRid) : null- const freestyle = !routine- const noProg = !freestyle && builtOutOfProgression(curEntry, routine)- // Freestyle has no routine prescription to apply: show the last target in the config- // sheet and carry its completed rows forward. A planned session uses its configured- // target when progression is off, while progression-enabled sessions keep their path.- const seed = freestyle ? freestyleConfig(sessionHistory(S), { id: ex.id, ...defaultConfig(ex.id) }) : null- const commit = cfg => update(s => {- const full = { ...cfg, id: ex.id }- // A planned session builds the exercise the way its routine would (prescription, reps- // source, target); freestyle reproduces what you did last time.- // Read from before the session's day when it is logged into the past (sessionHistory).- const past = sessionHistory(s)- const built = freestyle- ? { target: { ...cfg }, plan: null, sets: applyIntensifierPlan(buildSets(past, full, {- step: modeOf(full) === 'reps' ? weightIncrement(full, s.unit) : defaultIncrement(ex.id, s.unit), preferLast: true,- }), full, dropGrid(s, full)) }- : buildPlannedEntry(past, full, routine, { noProg })- const insertAt = insertionIndexAfterCurrentUnit(supersetUnits(s.active.entries), s.active.cur, s.active.entries.length)- s.active.entries.splice(insertAt, 0, joinSessionNoProg(s.active, { id: ex.id, ...built, ...(curRid ? { rid: curRid } : {}), ...(noProg ? { noProg: true } : {}) }))- s.active.cur = insertAt- useUI.getState().shiftRestOwner(insertAt, 1)- })- // The "+" on a picker row reads as "add this now" — routed through the same detail- // sheet before, so it added nothing until you'd scrolled past it and found the real- // button. Quick-add commits with the same default (or, freestyle, last-session) config- // the sheet would have opened with; tapping the row still opens that sheet for anyone- // who wants to set sets/reps first.- if (quick) { commit(seed || defaultConfig(ex.id)); useUI.getState().toast(t('“{0}” added to {1}', exerciseNameText(ex), routine ? routine.name : t('Freestyle'))) }- // The confirm names what it changes: this workout, never the routine behind it.- else exConfigSheet(ex, null, commit, null, routine, seed, null, t('Add to this workout'))- })} icon="plus">{t('Add exercise')}</Button>+ <Button onClick={addExercise} icon="plus">{t('Add exercise')}</Button>{wc.exerciseButtons && A.entries.length > 0 && <><div style={{ height: 6 }} /><div className="row">diff --git a/frontend/src/views/Workout.noprog.test.jsx b/frontend/src/views/Workout.noprog.test.jsxindex 1a07ef0b2..e98f4d53b 100644--- a/frontend/src/views/Workout.noprog.test.jsx+++ b/frontend/src/views/Workout.noprog.test.jsx@@ -175,9 +175,9 @@ describe('don’t count this session for progression', () => {return { ...useStore.getState().S, active: null, workouts: [...logged, saved] }}- it('Progression settings saved unchanged, then Undo: the session counts at 102.5 and the next one goes on from there', () => {+ it('Exercise settings saved unchanged, then Undo: the session counts at 102.5 and the next one goes on from there', () => {start()- const settings = menuItem(openMenu(), 'Progression settings')+ const settings = menuItem(openMenu(), 'Exercise settings')act(() => settings.click())const sheet = renderTopSheet()const save = [...sheet.querySelectorAll('button')].find(b => b.textContent.trim() === 'Save')@@ -216,11 +216,11 @@ describe('don’t count this session for progression', () => {})})- it('a deload routine’s exercise saved in Progression settings stays at the routine’s own numbers', () => {+ it('a deload routine’s exercise saved in Exercise settings stays at the routine’s own numbers', () => {// 70 × 8 in Main would put a counting row at 75; the deload keeps its 40.const rowInMain = { id: 'w0', d: '2026-09-18', routineIds: ['main'], entries: [{ id: ROW, rid: 'main', target: { sets: 1, reps: 8, weight: 70 }, sets: [{ w: 70, r: 8, done: true }] }] }renderWorkout([{ ...entry(ROW, 'deload', 40, { noProg: true }), target: { sets: 1, reps: 8, weight: 40 }, sets: [{ w: 40, r: 8, done: false }] }], { withHistory: [...history, rowInMain] })- const settings = menuItem(openMenu(), 'Progression settings')+ const settings = menuItem(openMenu(), 'Exercise settings')act(() => settings.click())const save = [...renderTopSheet().querySelectorAll('button')].find(b => b.textContent.trim() === 'Save')act(() => save.click())diff --git a/frontend/src/views/Workout.plates.test.jsx b/frontend/src/views/Workout.plates.test.jsxindex 38ba9c222..f1c78f4e4 100644--- a/frontend/src/views/Workout.plates.test.jsx+++ b/frontend/src/views/Workout.plates.test.jsx@@ -206,7 +206,7 @@ describe('plate line under set rows', () => {document.body.appendChild(sc)const sr = createRoot(sc)act(() => sr.render(useUI.getState().sheets.at(-1).render(() => {})))- expect(sc.textContent).toContain('Details')+ expect(sc.textContent).toContain('How to do it')expect(sc.textContent).not.toContain('Plate loading')act(() => sr.unmount()); sc.remove()})diff --git a/frontend/src/views/Workout.superset-scroll.test.jsx b/frontend/src/views/Workout.superset-scroll.test.jsxindex 60359284c..df620aa01 100644--- a/frontend/src/views/Workout.superset-scroll.test.jsx+++ b/frontend/src/views/Workout.superset-scroll.test.jsx@@ -5,6 +5,9 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest'import Workout from './Workout.jsx'import { effortPickerSheet } from '../sheets.jsx'+// A menu's actions in order, whether it came as one list or in groups (menuSheet `sections`).+const menuItemsOf = menu => (menu.sections ? menu.sections.flatMap(g => g.items || []) : menu.items || []).filter(Boolean)+// In the Cards layout a superset is one card, and a tick that moves the marker to the partner// centres the partner's next set row. Rating the set instead (RIR or RPE, one picker) closes the// picker and ticks the set in the same tap, and the sheet's un-pin puts the page back where it@@ -251,7 +254,7 @@ describe('the superset card after a rating', () => {// Through the exercise's own ⋯ menu, as a thumb does it: the move records the marker's new// index itself, which is what tells it apart from a real move.await press(container.querySelector('button[aria-label="More"]'))- const items = mocks.menuSheet.mock.calls.at(-1)[0].items.filter(Boolean)+ const items = menuItemsOf(mocks.menuSheet.mock.calls.at(-1)[0])await act(async () => { items.find(i => i.label === 'Move up').onClick() })await rerender()expect(mocks.S.active.entries[0].id).toBe('0025')diff --git a/frontend/src/views/Workout.test.jsx b/frontend/src/views/Workout.test.jsxindex 6163074cb..2d0101eac 100644--- a/frontend/src/views/Workout.test.jsx+++ b/frontend/src/views/Workout.test.jsx@@ -8,6 +8,9 @@ import { buildCombinedEntries } from '../lib/session-merge.js'import { buildCompletedWorkout } from '../lib/finish-workout.js'import { isWarmupRow } from '../lib/workout-model.js'+// A menu's actions in order, whether it came as one list or in groups (menuSheet `sections`).+const menuItemsOf = menu => (menu.sections ? menu.sections.flatMap(g => g.items || []) : menu.items || []).filter(Boolean)+const mocks = vi.hoisted(() => {const state = {S: null,@@ -29,6 +32,9 @@ const mocks = vi.hoisted(() => {effortPickerSheet: vi.fn(),exerciseHistorySheet: vi.fn(),renameWorkoutSheet: vi.fn(),+ durationSheet: vi.fn(),+ workoutSettingsSheet: vi.fn(),+ nav: vi.fn(),}state.stopRest = vi.fn(() => { state.timer = null })state.stopWork = vi.fn(() => { state.work = null })@@ -64,7 +70,7 @@ vi.mock('../store/useUI.js', () => {useUI.getState = mocks.uiSnapshotreturn { useUI }})-vi.mock('react-router-dom', () => ({ useNavigate: () => () => {} }))+vi.mock('react-router-dom', () => ({ useNavigate: () => mocks.nav }))vi.mock('../sheets.jsx', () => ({startFlow: vi.fn(),exercisePicker: mocks.exercisePicker,@@ -87,6 +93,12 @@ vi.mock('../sheets.jsx', () => ({addRoutineToSessionSheet: vi.fn(),}))vi.mock('../components/Media.jsx', () => ({ default: () => null }))+vi.mock('../components/WorkoutThumb.jsx', () => ({+ default: ({ onExpand }) => React.createElement('button', { className: 'wthumb', 'aria-label': 'Expand', onClick: onExpand }),+ hasWorkoutMedia: () => true,+}))+vi.mock('../components/DurationWheel.jsx', () => ({ durationSheet: mocks.durationSheet }))+vi.mock('../components/WorkoutSettingsSheet.jsx', () => ({ workoutSettingsSheet: mocks.workoutSettingsSheet }))// api.js reads navigator.userAgent at module scope. This file installs its own DOM inside the// tests rather than declaring a vitest environment, so it must not depend on an ambient one.vi.mock('../lib/api.js', () => ({@@ -175,10 +187,14 @@ async function pressProgression(index = 0) {return button}+// Discard lives at the end of the header's ⋯ menu (v1.3.11); the header's ⌄ only leaves the screen.async function requestDiscard() {- const button = container.querySelector('button[aria-label="Discard"]')+ const button = container.querySelector('button[aria-label="Workout options"]')expect(button).toBeTruthy()await act(async () => { button.dispatchEvent(new dom.Event('click', { bubbles: true })) })+ const discard = menuItemsOf(mocks.menuSheet.mock.calls.at(-1)[0]).find(it => it.label === 'Discard workout')+ expect(discard?.danger).toBe(true)+ await act(async () => { discard.onClick() })}async function rerender() {@@ -236,7 +252,7 @@ it('edits a saved set without running live completion, rest or success feedback'expect(container.querySelector('.progline')).toBeNull()const more = container.querySelector('button[aria-label="More"]')await act(async () => { more.dispatchEvent(new dom.Event('click', { bubbles: true })) })- expect(mocks.menuSheet.mock.calls.at(-1)[0].items.filter(Boolean).map(item => item.label)).not.toContain('Progression settings')+ expect(menuItemsOf(mocks.menuSheet.mock.calls.at(-1)[0]).map(item => item.label)).not.toContain('Progression settings')})afterEach(async () => {@@ -831,7 +847,7 @@ describe('progression guidance', () => {expect(button.tagName).toBe('BUTTON')expect(button.getAttribute('type')).toBe('button')- expect(button.getAttribute('aria-label')).toBe('Open progression settings')+ expect(button.getAttribute('aria-label')).toBe('Open exercise settings')expect(mocks.exConfigSheet).toHaveBeenCalledOnce()// An entry with no stamped plan opens at its target.expect(mocks.exConfigSheet.mock.calls[0][1]).toEqual(second.target)@@ -1663,7 +1679,7 @@ describe('workout view header menu', () => {await act(async () => { btn.dispatchEvent(new dom.Event('click', { bubbles: true })) })return mocks.menuSheet.mock.calls.at(-1)[0]}- const item = (menu, label) => menu.items.filter(Boolean).find(it => it.label === label)+ const item = (menu, label) => menuItemsOf(menu).find(it => it.label === label)// The header ⋮ now leads with "Add routine"; the layouts moved to a nested "Layout" sheet.const openLayout = async menu => {@@ -1671,11 +1687,16 @@ describe('workout view header menu', () => {return mocks.menuSheet.mock.calls.at(-1)[0]}- it('includes Rename workout, Add routine and the whole-workout progression switch, then a Layout sheet with the three layouts marked current', async () => {+ it('groups Workout settings, Add, This workout and Discard, then a Layout sheet with the three layouts marked current', async () => {await mount([exercise('plain-bench', [false])], 0, { active: { workoutView: 'list', routineIds: [] } })const menu = await openMenu()- expect(menu.items.filter(Boolean).map(it => it.label)).toEqual(['Rename workout', 'Add routine', 'Don’t count for progression', 'Layout'])+ expect(menu.sections.map(g => g.title)).toEqual([undefined, 'Add', 'This workout', undefined])+ expect(menuItemsOf(menu).map(it => it.label)).toEqual([+ 'Workout settings', 'Add exercise', 'Add routine', 'Rename workout', 'Layout', 'Add session note', 'Don’t count for progression', 'Discard workout',+ ])+ expect(item(menu, 'Workout settings').sub).toBe('1:30 rest · Silent')+ expect(item(menu, 'Discard workout').danger).toBe(true)expect(item(menu, 'Don’t count for progression')).toMatchObject({ sub: 'Every exercise in this workout', on: false })expect(item(menu, 'Layout').sub).toBe('List')@@ -1683,7 +1704,7 @@ describe('workout view header menu', () => {expect(mocks.renameWorkoutSheet).toHaveBeenCalled()const layout = await openLayout(menu)- expect(layout.items.filter(Boolean).map(it => it.label)).toEqual(['Cards', 'List', 'Compact'])+ expect(menuItemsOf(layout).map(it => it.label)).toEqual(['Cards', 'List', 'Compact'])expect(item(layout, 'List').on).toBe(true)expect(item(layout, 'Cards').on).toBe(false)})@@ -1701,7 +1722,7 @@ describe('workout view header menu', () => {describe('workout controls: the more menu and the set menu', () => {const lastMenu = () => mocks.menuSheet.mock.calls.at(-1)[0]- const item = label => lastMenu().items.filter(Boolean).find(it => it.label === label)+ const item = label => menuItemsOf(lastMenu()).find(it => it.label === label)it('shows one More button per exercise and no legacy button rows by default', async () => {await mount([exercise('plain-bench', [false]), exercise('plain-row', [false])])@@ -1716,8 +1737,8 @@ describe('workout controls: the more menu and the set menu', () => {await mount([exercise('plain-bench', [false]), exercise('plain-row', [false])], 0)await act(async () => { container.querySelector('button[aria-label="More"]').dispatchEvent(new dom.Event('click', { bubbles: true })) })expect(mocks.menuSheet).toHaveBeenCalledOnce()- expect(lastMenu().items.filter(Boolean).map(it => it.label)).toEqual(expect.arrayContaining([- 'Add note', 'Details', 'Add warm-up set', 'Make superset with next', 'Swap exercise', 'Move up', 'Move down', 'Remove exercise',+ expect(menuItemsOf(lastMenu()).map(it => it.label)).toEqual(expect.arrayContaining([+ 'Add note', 'How to do it', 'Add warm-up set', 'Make superset with next', 'Swap exercise', 'Move up', 'Move down', 'Remove exercise',]))expect(item('Move up').disabled).toBe(true)expect(item('Move down').disabled).toBe(false)@@ -1746,7 +1767,7 @@ describe('workout controls: the more menu and the set menu', () => {it('opens a per-set menu from the set number with drop, burst and remove', async () => {await mount([exercise('plain-bench', [false, false])])await act(async () => { container.querySelector('button[aria-label="Set 2"]').dispatchEvent(new dom.Event('click', { bubbles: true })) })- expect(lastMenu().items.filter(Boolean).map(it => it.label)).toEqual(['Drop set', 'Rest-pause burst', 'Remove this set'])+ expect(menuItemsOf(lastMenu()).map(it => it.label)).toEqual(['Drop set', 'Rest-pause burst', 'Remove this set'])await act(async () => { item('Drop set').onClick() })expect(mocks.S.active.entries[0].sets[1].drops?.length).toBe(1)@@ -2041,7 +2062,7 @@ describe('mark all sets done while logging a past workout', () => {await act(async () => { btn.dispatchEvent(new dom.Event('click', { bubbles: true })) })return mocks.menuSheet.mock.calls.at(-1)[0]}- const labels = menu => menu.items.filter(Boolean).map(it => it.label)+ const labels = menu => menuItemsOf(menu).map(it => it.label)it('ticks every set, stamps the top weight and offers the finish', async () => {await mount([@@ -2049,8 +2070,8 @@ describe('mark all sets done while logging a past workout', () => {exercise('plain-row', [false], { sets: [{ w: 40, r: 8, done: false, phase: 'warmup' }, { w: 70, r: 8, done: false }] }),], 0, { active: { backfill: { durationMin: 60, replaceId: null }, routineIds: [] } })const menu = await openMenu()- expect(labels(menu)[0]).toBe('Mark all sets done')- await act(async () => { menu.items.filter(Boolean)[0].onClick() })+ expect(menu.sections[2].items.filter(Boolean)[0].label).toBe('Mark all sets done')+ await act(async () => { menu.sections[2].items.filter(Boolean)[0].onClick() })expect(mocks.S.active.entries.every(e => e.sets.every(s => s.done))).toBe(true)expect(mocks.S.active.entries.map(e => e.topW)).toEqual([60, 70])expect(mocks.workoutCompleteSheet).toHaveBeenCalledTimes(1)@@ -2064,7 +2085,7 @@ describe('mark all sets done while logging a past workout', () => {describe('Update routine, from the More menu of an exercise', () => {const lastMenu = () => mocks.menuSheet.mock.calls.at(-1)[0]- const item = label => lastMenu().items.filter(Boolean).find(it => it.label === label)+ const item = label => menuItemsOf(lastMenu()).find(it => it.label === label)const openMore = async () => {await act(async () => { container.querySelector('button[aria-label="More"]').dispatchEvent(new dom.Event('click', { bubbles: true })) })}@@ -2121,7 +2142,7 @@ describe('Update routine, from the More menu of an exercise', () => {expect(item('Update routine').sub).toBe('Warm-up sets 0 → 1')item('Update routine').onClick()const { message } = mocks.confirmSheet.mock.calls[0][0]- expect(message).toMatch(/Progression settings/)+ expect(message).toMatch(/Exercise settings/)expect(message).toMatch(/note added for today stays with this workout/)mocks.confirmSheet.mock.calls[0][0].onConfirm()expect(mocks.S.routines[0].ex[0].note).toBeUndefined()@@ -2153,3 +2174,104 @@ describe('Update routine, from the More menu of an exercise', () => {expect(item('Update routine')).toBeUndefined()})})++describe('the workout screen chrome (v1.3.11)', () => {+ const lastMenu = () => mocks.menuSheet.mock.calls.at(-1)[0]+ const item = label => menuItemsOf(lastMenu()).find(it => it.label === label)+ const click = async el => { await act(async () => { el.dispatchEvent(new dom.Event('click', { bubbles: true })) }) }+ const openMore = () => click(container.querySelector('button[aria-label="More"]'))++ it('has a labelled Finish pill and a ⌄ that leaves the screen with the session still running', async () => {+ await mount([exercise('plain-bench', [false])])+ const pill = container.querySelector('.whdr-finish')+ expect(pill.textContent).toBe('Finish')+ expect(container.querySelector('button[aria-label="Discard"]')).toBeNull()+ await click(container.querySelector('button[aria-label="Minimize"]'))+ expect(mocks.nav).toHaveBeenCalledWith('/home')+ expect(mocks.S.active).not.toBeNull()+ })++ it('says Save in the editor of a saved workout, and keeps its close button', async () => {+ await mount([exercise('plain-bench', [true])], 0, { active: { editingWorkoutId: 'saved' } })+ const pill = container.querySelector('.whdr-finish')+ expect(pill.textContent).toBe('Save')+ expect(pill.getAttribute('aria-label')).toBe('Save changes')+ expect(container.querySelector('button[aria-label="Close editor"]')).toBeTruthy()+ expect(container.querySelector('button[aria-label="Minimize"]')).toBeNull()+ })++ it('leads the workout menu with Workout settings, which opens its sheet', async () => {+ await mount([exercise('plain-bench', [false])], 0, { restSec: 0, sound: true })+ await click(container.querySelector('button[aria-label="Workout options"]'))+ const ws = menuItemsOf(lastMenu())[0]+ expect(ws).toMatchObject({ label: 'Workout settings', sub: 'No rest timer · Sound', accent: true })+ ws.onClick()+ expect(mocks.workoutSettingsSheet).toHaveBeenCalledOnce()+ })++ it('adds an exercise from the workout menu the same way as the button under the session', async () => {+ await mount([exercise('plain-bench', [false])])+ await click(container.querySelector('button[aria-label="Workout options"]'))+ item('Add exercise').onClick()+ expect(mocks.exercisePicker).toHaveBeenCalledOnce()+ })++ it('groups the exercise menu: today, look it up, settings, order, and Remove on its own', async () => {+ await mount([exercise('plain-bench', [false]), exercise('plain-row', [false])])+ await openMore()+ const groups = lastMenu().sections.map(g => [g.title, g.items.filter(Boolean).map(it => it.label)])+ expect(groups).toEqual([+ ['Today', ['Swap exercise', 'Add warm-up set', 'Add note', 'Don’t count for progression']],+ ['Look it up', ['History', 'How to do it']],+ ['Settings', ['Exercise settings', 'Rest timer', 'Plate loading']],+ ['Order and supersets', ['Make superset with next', 'Move up', 'Move down']],+ [undefined, ['Remove exercise']],+ ])+ })++ it('sets an exercise’s own rest on the wheel, 0:00 meaning the default', async () => {+ await mount([exercise('plain-bench', [false])])+ await openMore()+ expect(item('Rest timer').sub).toBe('Default (1:30)')+ item('Rest timer').onClick()+ const opts = mocks.durationSheet.mock.calls.at(-1)[0]+ expect(opts).toMatchObject({ title: 'Rest for this exercise', value: 0, max: 900, off: 'Default (1:30)' })+ await act(async () => { opts.onDone(135) })+ expect(mocks.S.active.entries[0].target.restSec).toBe(135)+ await rerender()+ await openMore()+ expect(item('Rest timer').sub).toBe('2:15')+ item('Rest timer').onClick()+ expect(mocks.durationSheet.mock.calls.at(-1)[0].value).toBe(135)+ await act(async () => { mocks.durationSheet.mock.calls.at(-1)[0].onDone(0) })+ expect(mocks.S.active.entries[0].target.restSec).toBe(0)+ })++ it('has no rest item in the editor of a saved workout', async () => {+ await mount([exercise('plain-bench', [true])], 0, { active: { editingWorkoutId: 'saved' } })+ await openMore()+ expect(item('Rest timer')).toBeUndefined()+ })++ it('groups the set menu under a header, with Remove on its own', async () => {+ await mount([exercise('plain-bench', [false, false])])+ await click(container.querySelector('button[aria-label="Set 1"]'))+ expect(lastMenu().sections.map(g => g.title)).toEqual(['Add to this set', undefined])+ })++ it('shows a thumbnail instead of the animation when animations are Small, and a tap brings it back', async () => {+ await mount([exercise('plain-bench', [false])], 0, { gifSize: 'mini' })+ const thumb = container.querySelector('.wthumb')+ expect(thumb).toBeTruthy()+ await click(thumb)+ expect(mocks.S.gifSize).toBe('full')+ })++ it('has no thumbnail with full animations, or in the compact layout', async () => {+ await mount([exercise('plain-bench', [false])], 0, { gifSize: 'full' })+ expect(container.querySelector('.wthumb')).toBeNull()+ await unmount()+ await mount([exercise('plain-bench', [false])], 0, { gifSize: 'mini', active: { workoutView: 'compact' } })+ expect(container.querySelector('.wthumb')).toBeNull()+ })+})