diff --git a/frontend/app/Router.tsx b/frontend/app/Router.tsx index d3fc74bb8..33e5499a4 100644 --- a/frontend/app/Router.tsx +++ b/frontend/app/Router.tsx @@ -203,6 +203,7 @@ const Router: React.FC = (props) => { (location.pathname && location.pathname.includes('/session/')) || location.pathname.includes('/assist/') || location.pathname.includes('multiview'); + const hideMenu = hideHeader || location.pathname.includes('/onboarding/'); // const isPlayer = // isRoute(SESSION_PATH, location.pathname) || diff --git a/frontend/app/components/Onboarding/Onboarding.tsx b/frontend/app/components/Onboarding/Onboarding.tsx index f6b508446..b871d40bc 100644 --- a/frontend/app/components/Onboarding/Onboarding.tsx +++ b/frontend/app/components/Onboarding/Onboarding.tsx @@ -33,7 +33,7 @@ const Onboarding = (props: Props) => { } return ( -
+
diff --git a/frontend/app/components/shared/NoSessionsMessage/NoSessionsMessage.js b/frontend/app/components/shared/NoSessionsMessage/NoSessionsMessage.js index d503a33a9..e484c683e 100644 --- a/frontend/app/components/shared/NoSessionsMessage/NoSessionsMessage.js +++ b/frontend/app/components/shared/NoSessionsMessage/NoSessionsMessage.js @@ -14,6 +14,8 @@ const NoSessionsMessage = (props) => { } = props; const activeSite = sites.find((s) => s.id === siteId); const showNoSessions = !!activeSite && !activeSite.recorded; + const onboardingPath = withSiteId(onboardingRoute('installing'), siteId); + console.log('onboardingPath', onboardingPath, siteId); return ( <> {showNoSessions && ( @@ -36,7 +38,7 @@ const NoSessionsMessage = (props) => { diff --git a/frontend/app/layout/Layout.tsx b/frontend/app/layout/Layout.tsx index a2abe8a70..fe7f2ab5b 100644 --- a/frontend/app/layout/Layout.tsx +++ b/frontend/app/layout/Layout.tsx @@ -14,13 +14,14 @@ interface Props { function Layout(props: Props) { const { hideHeader, siteId } = props; const isPlayer = /\/(session|assist)\//.test(window.location.pathname); + return ( {!hideHeader && ( )} - {!hideHeader && ( + {!hideHeader && !window.location.pathname.includes('/onboarding/') && (