Skip to content

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

Onboarding: no tab bar under the first-launch card

Duarte Santosc28631761dde
diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx
index 5b5f8f4a6..1f4b73eec 100644
--- a/frontend/src/App.jsx
+++ b/frontend/src/App.jsx
@@ -175,7 +175,8 @@ function Shell() {
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'
+ // The first-launch card has no tabs either: they changed the route behind it.
+ const noTabs = inWorkout || loc.pathname === '/coach' || needsMobileOnboarding
const authed = user || isGuest
if (!ready && !authed) return (
diff --git a/frontend/src/App.no-tabs.test.js b/frontend/src/App.no-tabs.test.js
new file mode 100644
index 000000000..1a921fed9
--- /dev/null
+++ b/frontend/src/App.no-tabs.test.js
@@ -0,0 +1,15 @@
+// The Android app's first-launch card ("How do you want to use openGym?") showed the tab bar under
+// it, and a tap on a tab changed the route behind the card and stacked history entries for back to
+// walk through. Shell is not rendered in a test, so this reads the condition from the source.
+import { describe, expect, it } from 'vitest'
+import { readFileSync } from 'node:fs'
+
+const app = readFileSync(new URL('./App.jsx', import.meta.url), 'utf8')
+
+describe('the tab bar', () => {
+ it('stays away from the first-launch onboarding', () => {
+ const cond = app.match(/const noTabs = ([^\n]+)/)?.[1] || ''
+ expect(cond).toContain('needsMobileOnboarding')
+ expect(app).toMatch(/\{!noTabs && <TabBar /)
+ })
+})