diff --git a/gui/src/components/onboarding/pages/Home.tsx b/gui/src/components/onboarding/pages/Home.tsx index 52f53cfa4..e37dae030 100644 --- a/gui/src/components/onboarding/pages/Home.tsx +++ b/gui/src/components/onboarding/pages/Home.tsx @@ -4,13 +4,20 @@ import { Button } from '@/components/commons/Button'; import { SlimeVRIcon } from '@/components/commons/icon/SimevrIcon'; import { LangSelector } from '@/components/commons/LangSelector'; import { Typography } from '@/components/commons/Typography'; +import { useNavigate } from 'react-router-dom'; export function HomePage() { + const nav = useNavigate(); const { l10n } = useLocalization(); - const { applyProgress } = useOnboarding(); + const { applyProgress, onboardingStarted } = useOnboarding(); applyProgress(0.1); + const start = () => { + onboardingStarted(); + nav('/onboarding/quiz/slime-set'); + }; + return ( <>
@@ -19,7 +26,7 @@ export function HomePage() { {l10n.getString('onboarding-home')} -
diff --git a/gui/src/components/onboarding/pages/quiz/MocapPreferencesQuestions.tsx b/gui/src/components/onboarding/pages/quiz/MocapPreferencesQuestions.tsx index c2dbdb4f0..5f2484233 100644 --- a/gui/src/components/onboarding/pages/quiz/MocapPreferencesQuestions.tsx +++ b/gui/src/components/onboarding/pages/quiz/MocapPreferencesQuestions.tsx @@ -7,10 +7,18 @@ import { useState } from 'react'; import { SittingIcon } from '@/components/commons/icon/SittingIcon'; import { VMCFileUpload } from '@/components/settings/pages/VMCSettings'; import { QuizButton } from './SlimeSetQuestion'; +import { useNavigate } from 'react-router-dom'; export function QuizMocapPosQuestion() { - const { applyProgress, setMocapPos, mocapPos, playspace, setPlayspace } = - useOnboarding(); + const nav = useNavigate(); + const { + applyProgress, + setMocapPos, + mocapPos, + playspace, + setPlayspace, + onboardingEnded, + } = useOnboarding(); const [headTracker, setHeadTracker] = useState(true); @@ -18,6 +26,11 @@ export function QuizMocapPosQuestion() { const canContinue = (!headTracker || mocapPos) && playspace; + const end = () => { + onboardingEnded(); + nav('/'); + }; + return (
@@ -146,7 +159,7 @@ export function QuizMocapPosQuestion() { variant="primary" id="onboarding-quiz_continue" disabled={!canContinue} - to="/" + onClick={end} />
diff --git a/gui/src/components/onboarding/pages/quiz/RuntimeQuestion.tsx b/gui/src/components/onboarding/pages/quiz/RuntimeQuestion.tsx index 08498107b..c4694e584 100644 --- a/gui/src/components/onboarding/pages/quiz/RuntimeQuestion.tsx +++ b/gui/src/components/onboarding/pages/quiz/RuntimeQuestion.tsx @@ -7,13 +7,14 @@ import { useNavigate } from 'react-router-dom'; import { Button } from '@/components/commons/Button'; export function QuizRuntimeQuestion() { - const { applyProgress, setVrcOSC, vrcOsc } = useOnboarding(); + const { applyProgress, setVrcOSC, vrcOsc, onboardingEnded } = useOnboarding(); const nav = useNavigate(); applyProgress(0.9); const next = (type: typeof vrcOsc) => { setVrcOSC(type); + onboardingEnded(); nav('/'); }; diff --git a/gui/src/hooks/onboarding.ts b/gui/src/hooks/onboarding.ts index 9482b45dc..47cc1be8d 100644 --- a/gui/src/hooks/onboarding.ts +++ b/gui/src/hooks/onboarding.ts @@ -78,8 +78,7 @@ export function useProvideOnboarding() { const { sendRPCPacket, useRPCPacket } = useWebsocketAPI(); - const { state: locatioState, pathname } = useLocation(); - const [previousPath, setPreviousPath] = useState(pathname); + const { state: locatioState } = useLocation(); const [settings, setSettings] = useState(); useLayoutEffect(() => { @@ -139,17 +138,6 @@ export function useProvideOnboarding() { setPlayspace(undefined); }; - useEffect(() => { - setPreviousPath(pathname); - - if (!pathname.startsWith('/onboarding') && previousPath.startsWith('/onboarding')) { - onboardingEnded(); - } - if (pathname.startsWith('/onboarding') && !previousPath.startsWith('/onboarding')) { - onboardingStarted(); - } - }, [pathname]); - return { state, slimeSet, @@ -173,6 +161,8 @@ export function useProvideOnboarding() { setUsage, setVrcOSC, setMocapPos, + onboardingEnded, + onboardingStarted, }; }