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
Review fixes: private-network access only for the app's own origins, '1 set' in History rows, dead import gone
Duarte Santos7f2af4111a24
diff --git a/api/server.js b/api/server.jsindex e9a85f74c..3bf362d04 100644--- a/api/server.js+++ b/api/server.js@@ -2403,6 +2403,9 @@ function bodyDeadline(req) {req.allowSlowBody = clear;}+// The Capacitor WebView origins of the Android and iOS app.+const APP_ORIGINS = new Set(['https://localhost', 'capacitor://localhost', 'http://localhost']);+const server = http.createServer(async (req, res) => {bodyDeadline(req);// Same-origin (the deployed nginx-proxied web app) never triggers CORS, so this only matters@@ -2414,7 +2417,10 @@ const server = http.createServer(async (req, res) => {if (req.method === 'OPTIONS') {// Chrome's Private Network Access asks before a page reaches a LAN address (a phone pairing// with 192.168.x.x); an answer without this header is refused like a CORS failure (#329).- const pna = String(req.headers['access-control-request-private-network'] || '').toLowerCase() === 'true';+ // Only the app's own WebView origins get it, so an arbitrary website still can't reach a+ // LAN-only instance through the visitor's browser.+ const pna = String(req.headers['access-control-request-private-network'] || '').toLowerCase() === 'true'+ && APP_ORIGINS.has(origin);res.writeHead(204, {'Access-Control-Allow-Methods': 'GET,POST,PUT,DELETE,OPTIONS','Access-Control-Allow-Headers': 'Content-Type, Authorization',diff --git a/api/test/server-cors.test.js b/api/test/server-cors.test.jsindex bec321cb8..a78221fa5 100644--- a/api/test/server-cors.test.js+++ b/api/test/server-cors.test.js@@ -80,3 +80,10 @@ test('a preflight that asks for private-network access gets it', async t => {assert.equal(r.status, 204);assert.equal(r.headers['access-control-allow-private-network'], 'true');});++test('a website on another origin gets no private-network access', async t => {+ const port = await startServer(t);+ const r = await send(port, 'OPTIONS', '/api/pair/redeem', preflight('https://evil.example', { 'Access-Control-Request-Private-Network': 'true' }));+ assert.equal(r.status, 204);+ assert.equal(r.headers['access-control-allow-private-network'], undefined);+});diff --git a/frontend/src/lib/pt-br-locale.test.js b/frontend/src/lib/pt-br-locale.test.jsindex e92f7ce75..e1cb538b9 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('30dbb64e92b22efa48b5cf00fc989111d4bfd84d0b533a03f315a0041a9538c9')+ expect(fingerprint, 'pt-PT inheritance changed; review the inherited pt-BR wording').toBe('135c43ff734c243db89c050010b74ef031731e4d560492bc3b66db874bffb989')})test('does not leak European Portuguese UI terms', () => {diff --git a/frontend/src/locales/ar.js b/frontend/src/locales/ar.jsindex ca083518a..16eddc98d 100644--- a/frontend/src/locales/ar.js+++ b/frontend/src/locales/ar.js@@ -145,6 +145,7 @@ export default {'Completed': 'مكتمل','Rescheduled': 'أُعيدت جدولته','Tap a trained day for details · tap any other day to plan a session': 'اضغط على يوم تدرّبت فيه للتفاصيل · اضغط على أي يوم آخر لجدولة جلسة',+ '{0} set': '{0} مجموعة','{0} sets': '{0} مجموعات','no sets': 'بدون مجموعات','Delete workout?': 'حذف التمرين؟',diff --git a/frontend/src/locales/de.js b/frontend/src/locales/de.jsindex f471d5507..3f5de3961 100644--- a/frontend/src/locales/de.js+++ b/frontend/src/locales/de.js@@ -146,6 +146,7 @@ export default {'Rescheduled': 'Verschoben','Tap a trained day for details · tap any other day to plan a session': 'Tippe auf einen trainierten Tag für Details · tippe auf jeden anderen Tag, um zu planen',// --- workout lifecycle ---+ '{0} set': '{0} Satz','{0} sets': '{0} Sätze','no sets': 'keine Sätze','Delete workout?': 'Training löschen?',diff --git a/frontend/src/locales/es.js b/frontend/src/locales/es.jsindex cd43af540..9eef4261a 100644--- a/frontend/src/locales/es.js+++ b/frontend/src/locales/es.js@@ -139,6 +139,7 @@ export default {'Completed': 'Completado','Rescheduled': 'Reprogramado','Tap a trained day for details · tap any other day to plan a session': 'Toca un día entrenado para ver detalles · toca cualquier otro día para planificar',+ '{0} set': '{0} serie','{0} sets': '{0} series','no sets': 'sin series','Delete workout?': '¿Eliminar entrenamiento?',diff --git a/frontend/src/locales/fr.js b/frontend/src/locales/fr.jsindex b974c50a1..cead0e98e 100644--- a/frontend/src/locales/fr.js+++ b/frontend/src/locales/fr.js@@ -139,6 +139,7 @@ export default {'Completed': 'Terminé','Rescheduled': 'Reprogrammé','Tap a trained day for details · tap any other day to plan a session': 'Tape un jour entraîné pour les détails · tape un autre jour pour planifier',+ '{0} set': '{0} série','{0} sets': '{0} séries','no sets': 'aucune série','Delete workout?': 'Supprimer la séance ?',diff --git a/frontend/src/locales/hi.js b/frontend/src/locales/hi.jsindex 41732e130..277d07b33 100644--- a/frontend/src/locales/hi.js+++ b/frontend/src/locales/hi.js@@ -139,6 +139,7 @@ export default {'Completed': 'पूरा किया','Rescheduled': 'बदला गया','Tap a trained day for details · tap any other day to plan a session': 'विवरण के लिए ट्रेन किए दिन पर टैप करें · योजना बनाने के लिए किसी और दिन पर टैप करें',+ '{0} set': '{0} सेट','{0} sets': '{0} सेट','no sets': 'कोई सेट नहीं','Delete workout?': 'वर्कआउट हटाएँ?',diff --git a/frontend/src/locales/hu.js b/frontend/src/locales/hu.jsindex 4c5deb4e3..35cf2b643 100644--- a/frontend/src/locales/hu.js+++ b/frontend/src/locales/hu.js@@ -137,6 +137,7 @@ export default {'Rescheduled': 'Áthelyezve','Tap a trained day for details · tap any other day to plan a session': 'Koppints egy edzett napra a részletekért · koppints bármely másik napra egy edzés tervezéséhez',// --- workout lifecycle ---+ '{0} set': '{0} sorozat','{0} sets': '{0} sorozat','no sets': 'nincs sorozat','Delete workout?': 'Törlöd az edzést?',diff --git a/frontend/src/locales/it.js b/frontend/src/locales/it.jsindex 3375db8ed..d847be0dd 100644--- a/frontend/src/locales/it.js+++ b/frontend/src/locales/it.js@@ -139,6 +139,7 @@ export default {'Completed': 'Completato','Rescheduled': 'Riprogrammato','Tap a trained day for details · tap any other day to plan a session': 'Tocca un giorno allenato per i dettagli · tocca un altro giorno per pianificare',+ '{0} set': '{0} serie','{0} sets': '{0} serie','no sets': 'nessuna serie','Delete workout?': 'Eliminare allenamento?',diff --git a/frontend/src/locales/ko.js b/frontend/src/locales/ko.jsindex 76732991d..4e75598e6 100644--- a/frontend/src/locales/ko.js+++ b/frontend/src/locales/ko.js@@ -139,6 +139,7 @@ export default {'Completed': '완료','Rescheduled': '변경됨','Tap a trained day for details · tap any other day to plan a session': '운동한 날을 탭하면 상세 정보 · 다른 날을 탭하면 계획 설정',+ '{0} set': '{0}세트','{0} sets': '{0}세트','no sets': '세트 없음','Delete workout?': '운동을 삭제할까요?',diff --git a/frontend/src/locales/pl.js b/frontend/src/locales/pl.jsindex b10a5f2df..ca2f81c61 100644--- a/frontend/src/locales/pl.js+++ b/frontend/src/locales/pl.js@@ -139,6 +139,7 @@ export default {'Completed': 'Wykonano','Rescheduled': 'Przełożono','Tap a trained day for details · tap any other day to plan a session': 'Dotknij dnia z treningiem, aby zobaczyć szczegóły · dotknij innego dnia, aby zaplanować',+ '{0} set': '{0} seria','{0} sets': '{0} serii','no sets': 'brak serii','Delete workout?': 'Usunąć trening?',diff --git a/frontend/src/locales/pt.js b/frontend/src/locales/pt.jsindex e77ad4382..933e1f082 100644--- a/frontend/src/locales/pt.js+++ b/frontend/src/locales/pt.js@@ -139,6 +139,7 @@ export default {'Completed': 'Concluído','Rescheduled': 'Reagendado','Tap a trained day for details · tap any other day to plan a session': 'Toca num dia treinado para detalhes · toca noutro dia para planear',+ '{0} set': '{0} série','{0} sets': '{0} séries','no sets': 'sem séries','Delete workout?': 'Eliminar treino?',diff --git a/frontend/src/locales/ru.js b/frontend/src/locales/ru.jsindex b5055364d..18b1398d1 100644--- a/frontend/src/locales/ru.js+++ b/frontend/src/locales/ru.js@@ -135,6 +135,7 @@ export default {'Completed': 'Выполнено','Rescheduled': 'Перенесено','Tap a trained day for details · tap any other day to plan a session': 'Нажми на день с тренировкой — детали · на любой другой — планирование',+ '{0} set': 'подходов: {0}','{0} sets': 'подходов: {0}','no sets': 'нет подходов','Delete workout?': 'Удалить тренировку?',diff --git a/frontend/src/locales/th.js b/frontend/src/locales/th.jsindex 28f182260..ef3f48a94 100644--- a/frontend/src/locales/th.js+++ b/frontend/src/locales/th.js@@ -137,6 +137,7 @@ export default {'Rescheduled': 'เลื่อนแล้ว','Tap a trained day for details · tap any other day to plan a session': 'แตะวันที่ออกกำลังกายแล้วเพื่อดูรายละเอียด · แตะวันอื่นเพื่อวางแผน',// --- workout lifecycle ---+ '{0} set': '{0} เซ็ต','{0} sets': '{0} เซ็ต','no sets': 'ไม่มีเซ็ต','Delete workout?': 'ลบการออกกำลังกายนี้?',diff --git a/frontend/src/locales/tr.js b/frontend/src/locales/tr.jsindex 95466a001..393a3862f 100644--- a/frontend/src/locales/tr.js+++ b/frontend/src/locales/tr.js@@ -139,6 +139,7 @@ export default {'Completed': 'Tamamlandı','Rescheduled': 'Ertelendi','Tap a trained day for details · tap any other day to plan a session': 'Antrenman yapılan güne dokun: detaylar · başka bir güne dokun: planla',+ '{0} set': '{0} set','{0} sets': '{0} set','no sets': 'set yok','Delete workout?': 'Antrenman silinsin mi?',diff --git a/frontend/src/locales/uk.js b/frontend/src/locales/uk.jsindex c132b7f8a..deeba4054 100644--- a/frontend/src/locales/uk.js+++ b/frontend/src/locales/uk.js@@ -123,6 +123,7 @@ export default {'Completed': 'Виконано','Rescheduled': 'Перенесено','Tap a trained day for details · tap any other day to plan a session': 'Натисни на день із тренуванням — деталі · на будь-який інший — планування',+ '{0} set': 'підходів: {0}','{0} sets': 'підходів: {0}','no sets': 'немає підходів','Delete workout?': 'Видалити тренування?',diff --git a/frontend/src/locales/zh-TW.js b/frontend/src/locales/zh-TW.jsindex 1c8b2aa65..b56d2c263 100644--- a/frontend/src/locales/zh-TW.js+++ b/frontend/src/locales/zh-TW.js@@ -135,6 +135,7 @@ export default {'Planned': '已排定','Rescheduled': '已改期','Tap a trained day for details · tap any other day to plan a session': '點擊已訓練日期以查看詳情 · 點擊其他日期以排定課表',+ '{0} set': '{0} 組','{0} sets': '{0} 組','no sets': '無組數','Delete workout?': '刪除本次訓練?',diff --git a/frontend/src/locales/zh.js b/frontend/src/locales/zh.jsindex f0c57e3da..e981591c0 100644--- a/frontend/src/locales/zh.js+++ b/frontend/src/locales/zh.js@@ -139,6 +139,7 @@ export default {'Completed': '已完成','Rescheduled': '已改期','Tap a trained day for details · tap any other day to plan a session': '点按已训练的日期查看详情 · 点按其他日期安排训练',+ '{0} set': '{0} 组','{0} sets': '{0} 组','no sets': '无组数','Delete workout?': '删除训练?',diff --git a/frontend/src/sheets.jsx b/frontend/src/sheets.jsxindex 115d22f3e..d3dc1b38d 100644--- a/frontend/src/sheets.jsx+++ b/frontend/src/sheets.jsx@@ -40,7 +40,6 @@ import { refillAfter } from './lib/rotation.js'import { isWarmupRow, hasCompletedWork } from './lib/workout-model.js'import { saveSessionAsRoutine } from './lib/session-routines.js'import { repeatSessionEntries } from './lib/session-repeat.js'-import { nextUnfinishedUnit } from './lib/supersetFlow.js'import { swapActiveExercise } from './lib/active-exercise-swap.js'import { useSheetKeyboard, useRevealActiveChip, tappable } from './lib/use-sheet-keyboard.js'import { isFav, toggleFav, sortFavouritesFirst } from './lib/favourites.js'@@ -2268,7 +2267,7 @@ export function WorkoutRow({ w, onClick }) {return <div className="item" {...tappable(onClick)}><span className="lrow-i" style={{ width: 34, height: 34, borderRadius: 8, fontSize: 19 }}><Icon name={glyph} /></span><div className="grow"><div className="tt">{w.name}</div>- <div className="ss">{[fmtDate(w.d, true), ...durPart(w.end - w.start), t('{0} sets', setsDone(w)), fmtVol(w.vol, st.unit)].join(' · ')}</div></div>+ <div className="ss">{[fmtDate(w.d, true), ...durPart(w.end - w.start), tn('{0} set', '{0} sets', setsDone(w)), fmtVol(w.vol, st.unit)].join(' · ')}</div></div>{mediaN > 0 && <span className="wrow-media" title={tn('{0} photo or video', '{0} photos or videos', mediaN)} aria-label={tn('{0} photo or video', '{0} photos or videos', mediaN)}><Icon name="image" />{mediaN}</span>}{w.prs && w.prs.length > 0 && <span className="pr"><Icon name="trophy" />{w.prs.length} PR</span>}<Icon name="chevronRight" className="chev" />