diff --git a/gui/src/components/commons/Dropdown.tsx b/gui/src/components/commons/Dropdown.tsx index fad5fd154..40c98374f 100644 --- a/gui/src/components/commons/Dropdown.tsx +++ b/gui/src/components/commons/Dropdown.tsx @@ -139,7 +139,7 @@ export function Dropdown({
(
  • (); const { isMobile } = useBreakpoint('mobile'); - const { state } = useOnboarding(); + const { state, skipSetup } = useOnboarding(); + const [skipWarning, setSkipWarning] = useState(false); return !state.alonePage ? ( <>
    +
    + setSkipWarning(true)} + > +
    {children} + setSkipWarning(false)} + isOpen={skipWarning} + >
    ) : ( diff --git a/gui/src/components/onboarding/pages/CalibrationTutorial.tsx b/gui/src/components/onboarding/pages/CalibrationTutorial.tsx index edd39eb7c..1c73479d8 100644 --- a/gui/src/components/onboarding/pages/CalibrationTutorial.tsx +++ b/gui/src/components/onboarding/pages/CalibrationTutorial.tsx @@ -3,8 +3,6 @@ import { useOnboarding } from '../../../hooks/onboarding'; import { Button } from '../../commons/Button'; import { Typography } from '../../commons/Typography'; import { useMemo, useState } from 'react'; -import { SkipSetupWarningModal } from '../SkipSetupWarningModal'; -import { SkipSetupButton } from '../SkipSetupButton'; import { ProgressBar } from '../../commons/ProgressBar'; import { LoaderIcon, SlimeState } from '../../commons/icon/LoaderIcon'; import { useCountdown } from '../../../hooks/countdown'; @@ -22,8 +20,7 @@ export const IMU_CALIBRATION_TIME = 4; export function CalibrationTutorialPage() { const { l10n } = useLocalization(); - const { applyProgress, skipSetup } = useOnboarding(); - const [skipWarning, setSkipWarning] = useState(false); + const { applyProgress } = useOnboarding(); const [calibrationStatus, setCalibrationStatus] = useState( CalibrationStatus.WAITING ); @@ -72,11 +69,6 @@ export function CalibrationTutorialPage() { return ( <>
    - setSkipWarning(true)} - >
    @@ -160,11 +152,6 @@ export function CalibrationTutorialPage() {
    - setSkipWarning(false)} - isOpen={skipWarning} - >
    ); diff --git a/gui/src/components/onboarding/pages/ConnectTracker.tsx b/gui/src/components/onboarding/pages/ConnectTracker.tsx index b5a796c0f..0ed0ac4b5 100644 --- a/gui/src/components/onboarding/pages/ConnectTracker.tsx +++ b/gui/src/components/onboarding/pages/ConnectTracker.tsx @@ -20,8 +20,6 @@ import { ProgressBar } from '../../commons/ProgressBar'; import { TipBox } from '../../commons/TipBox'; import { Typography } from '../../commons/Typography'; import { TrackerCard } from '../../tracker/TrackerCard'; -import { SkipSetupWarningModal } from '../SkipSetupWarningModal'; -import { SkipSetupButton } from '../SkipSetupButton'; import { useBnoExists } from '../../../hooks/imu-logic'; import { useBreakpoint } from '../../../hooks/breakpoint'; @@ -60,16 +58,13 @@ const statusProgressMap = { export function ConnectTrackersPage() { const { isMobile } = useBreakpoint('mobile'); const { l10n } = useLocalization(); - const { layoutHeight, ref } = isMobile - ? { layoutHeight: 0, ref: undefined } - : useLayout(); + const { layoutHeight, ref } = useLayout(); const { useConnectedTrackers } = useTrackers(); - const { applyProgress, state, skipSetup } = useOnboarding(); + const { applyProgress, state } = useOnboarding(); const navigate = useNavigate(); const { sendRPCPacket, useRPCPacket } = useWebsocketAPI(); const [provisioningStatus, setProvisioningStatus] = useState(WifiProvisioningStatus.NONE); - const [skipWarning, setSkipWarning] = useState(false); applyProgress(0.4); @@ -132,14 +127,9 @@ export function ConnectTrackersPage() { }, [provisioningStatus]); return ( -
    - setSkipWarning(true)} - > +
    -
    +
    {l10n.getString('onboarding-connect_tracker-title')} @@ -237,20 +227,24 @@ export function ConnectTrackersPage() {
    -
    +
    {Array.from({ ...connectedTrackers, - length: Math.max(connectedTrackers.length, isMobile ? 1 : 20), + length: Math.max(connectedTrackers.length, 1), }).map((tracker, index) => (
    {!tracker && (
    - setSkipWarning(false)} - isOpen={skipWarning} - >
    ); } diff --git a/gui/src/components/onboarding/pages/Home.tsx b/gui/src/components/onboarding/pages/Home.tsx index f79126129..3400f84ea 100644 --- a/gui/src/components/onboarding/pages/Home.tsx +++ b/gui/src/components/onboarding/pages/Home.tsx @@ -1,28 +1,19 @@ import { useLocalization } from '@fluent/react'; -import { useState } from 'react'; import { useOnboarding } from '../../../hooks/onboarding'; import { Button } from '../../commons/Button'; import { SlimeVRIcon } from '../../commons/icon/SimevrIcon'; import { LangSelector } from '../../commons/LangSelector'; import { Typography } from '../../commons/Typography'; -import { SkipSetupButton } from '../SkipSetupButton'; -import { SkipSetupWarningModal } from '../SkipSetupWarningModal'; export function HomePage() { const { l10n } = useLocalization(); - const { applyProgress, skipSetup } = useOnboarding(); - const [skipWarning, setSkipWarning] = useState(false); + const { applyProgress } = useOnboarding(); applyProgress(0.1); return ( <> -
    - setSkipWarning(true)} - > +
    @@ -64,11 +55,6 @@ export function HomePage() { }} />
    - setSkipWarning(false)} - isOpen={skipWarning} - > ); } diff --git a/gui/src/components/onboarding/pages/ResetTutorial.tsx b/gui/src/components/onboarding/pages/ResetTutorial.tsx index 5f5f1854a..4a04ea74a 100644 --- a/gui/src/components/onboarding/pages/ResetTutorial.tsx +++ b/gui/src/components/onboarding/pages/ResetTutorial.tsx @@ -3,8 +3,6 @@ import { useOnboarding } from '../../../hooks/onboarding'; import { Button } from '../../commons/Button'; import { Typography } from '../../commons/Typography'; import { useState, useMemo, useEffect } from 'react'; -import { SkipSetupWarningModal } from '../SkipSetupWarningModal'; -import { SkipSetupButton } from '../SkipSetupButton'; import { BodyPart, ResetResponseT, @@ -23,8 +21,7 @@ import { useBreakpoint } from '../../../hooks/breakpoint'; export function ResetTutorialPage() { const { isMobile } = useBreakpoint('mobile'); const { l10n } = useLocalization(); - const { applyProgress, skipSetup } = useOnboarding(); - const [skipWarning, setSkipWarning] = useState(false); + const { applyProgress } = useOnboarding(); const { useAssignedTrackers } = useTrackers(); const { useRPCPacket, sendRPCPacket } = useWebsocketAPI(); const [curIndex, setCurIndex] = useState(0); @@ -122,11 +119,6 @@ export function ResetTutorialPage() { return (
    - setSkipWarning(true)} - >
    @@ -197,11 +189,6 @@ export function ResetTutorialPage() {
    - setSkipWarning(false)} - isOpen={skipWarning} - >
    ); } diff --git a/gui/src/components/onboarding/pages/WifiCreds.tsx b/gui/src/components/onboarding/pages/WifiCreds.tsx index f17538d6c..0526ab803 100644 --- a/gui/src/components/onboarding/pages/WifiCreds.tsx +++ b/gui/src/components/onboarding/pages/WifiCreds.tsx @@ -4,19 +4,15 @@ import { useWifiForm } from '../../../hooks/wifi-form'; import { Button } from '../../commons/Button'; import { Input } from '../../commons/Input'; import { Typography } from '../../commons/Typography'; -import { useState } from 'react'; -import { SkipSetupWarningModal } from '../SkipSetupWarningModal'; -import { SkipSetupButton } from '../SkipSetupButton'; import classNames from 'classnames'; import { useTrackers } from '../../../hooks/tracker'; import { useBnoExists } from '../../../hooks/imu-logic'; export function WifiCredsPage() { const { l10n } = useLocalization(); - const { applyProgress, skipSetup, state } = useOnboarding(); + const { applyProgress, state } = useOnboarding(); const { control, handleSubmit, submitWifiCreds, formState } = useWifiForm(); const { useConnectedTrackers } = useTrackers(); - const [skipWarning, setSkipWarning] = useState(false); const connectedTrackers = useConnectedTrackers(); applyProgress(0.2); @@ -29,11 +25,6 @@ export function WifiCredsPage() { onSubmit={handleSubmit(submitWifiCreds)} >
    - setSkipWarning(true)} - >
    @@ -117,11 +108,6 @@ export function WifiCredsPage() {
    - setSkipWarning(false)} - isOpen={skipWarning} - > ); } diff --git a/gui/src/components/onboarding/pages/assignment-preparation/AssignmentTutorial.tsx b/gui/src/components/onboarding/pages/assignment-preparation/AssignmentTutorial.tsx index 72148ed62..94a2280fe 100644 --- a/gui/src/components/onboarding/pages/assignment-preparation/AssignmentTutorial.tsx +++ b/gui/src/components/onboarding/pages/assignment-preparation/AssignmentTutorial.tsx @@ -2,9 +2,6 @@ import { useLocalization } from '@fluent/react'; import { useOnboarding } from '../../../../hooks/onboarding'; import { Button } from '../../../commons/Button'; import { Typography } from '../../../commons/Typography'; -import { useState } from 'react'; -import { SkipSetupWarningModal } from '../../SkipSetupWarningModal'; -import { SkipSetupButton } from '../../SkipSetupButton'; import { useTrackers } from '../../../../hooks/tracker'; import { useBnoExists } from '../../../../hooks/imu-logic'; import { StickerSlime } from './StickerSlime'; @@ -13,8 +10,7 @@ import { ExtensionArrow } from './ExtensionArrow'; export function AssignmentTutorialPage() { const { l10n } = useLocalization(); - const { applyProgress, skipSetup } = useOnboarding(); - const [skipWarning, setSkipWarning] = useState(false); + const { applyProgress } = useOnboarding(); const { useConnectedTrackers } = useTrackers(); const connectedTrackers = useConnectedTrackers(); const bnoExists = useBnoExists(connectedTrackers); @@ -23,83 +19,71 @@ export function AssignmentTutorialPage() { return ( <> -
    - setSkipWarning(true)} - > -
    -
    -
    - - {l10n.getString('onboarding-assignment_tutorial')} - +
    +
    +
    + + {l10n.getString('onboarding-assignment_tutorial')} + +
    +
    +
    +
    +
    + + {l10n.getString( + 'onboarding-assignment_tutorial-first_step' + )} + +
    +
    + +
    +
    +
    +
    + + {l10n.getString( + 'onboarding-assignment_tutorial-second_step' + )} + +
    +
    + +
    +
    + + {l10n.getString( + 'onboarding-assignment_tutorial-second_step-continuation' + )} + +
    +
    + +
    +
    -
    -
    -
    -
    - - {l10n.getString( - 'onboarding-assignment_tutorial-first_step' - )} - -
    -
    - -
    -
    -
    -
    - - {l10n.getString( - 'onboarding-assignment_tutorial-second_step' - )} - -
    -
    - -
    -
    - - {l10n.getString( - 'onboarding-assignment_tutorial-second_step-continuation' - )} - -
    -
    - -
    -
    -
    -
    - - -
    +
    + +
    - setSkipWarning(false)} - isOpen={skipWarning} - >
    ); diff --git a/gui/src/components/onboarding/pages/body-proportions/AutomaticProportions.tsx b/gui/src/components/onboarding/pages/body-proportions/AutomaticProportions.tsx index 5e87a8794..62b31ad33 100644 --- a/gui/src/components/onboarding/pages/body-proportions/AutomaticProportions.tsx +++ b/gui/src/components/onboarding/pages/body-proportions/AutomaticProportions.tsx @@ -1,5 +1,4 @@ import { useLocalization } from '@fluent/react'; -import { useState } from 'react'; import { RpcMessage, SkeletonResetAllRequestT } from 'solarxr-protocol'; import { AutoboneContextC, @@ -16,16 +15,13 @@ import { PutTrackersOnStep } from './autobone-steps/PutTrackersOn'; import { Recording } from './autobone-steps/Recording'; import { StartRecording } from './autobone-steps/StartRecording'; import { VerifyResultsStep } from './autobone-steps/VerifyResults'; -import { SkipSetupWarningModal } from '../../SkipSetupWarningModal'; -import { SkipSetupButton } from '../../SkipSetupButton'; import { useCountdown } from '../../../../hooks/countdown'; export function AutomaticProportionsPage() { const { l10n } = useLocalization(); - const { applyProgress, skipSetup, state } = useOnboarding(); + const { applyProgress, state } = useOnboarding(); const { sendRPCPacket } = useWebsocketAPI(); const context = useProvideAutobone(); - const [skipWarning, setSkipWarning] = useState(false); const { isCounting, startCountdown, timer } = useCountdown({ onCountdownEnd: () => { sendRPCPacket( @@ -39,13 +35,8 @@ export function AutomaticProportionsPage() { return ( -
    - setSkipWarning(true)} - > -
    +
    +
    {l10n.getString('onboarding-automatic_proportions-title')} @@ -85,11 +76,6 @@ export function AutomaticProportionsPage() {
    - setSkipWarning(false)} - isOpen={skipWarning} - > ); } diff --git a/gui/src/components/onboarding/pages/body-proportions/ManualProportions.tsx b/gui/src/components/onboarding/pages/body-proportions/ManualProportions.tsx index 04b571074..a3d2b4873 100644 --- a/gui/src/components/onboarding/pages/body-proportions/ManualProportions.tsx +++ b/gui/src/components/onboarding/pages/body-proportions/ManualProportions.tsx @@ -8,9 +8,7 @@ import { PersonFrontIcon } from '../../../commons/PersonFrontIcon'; import { Typography } from '../../../commons/Typography'; import { BodyProportions } from './BodyProportions'; import { useLocalization } from '@fluent/react'; -import { useEffect, useMemo, useState } from 'react'; -import { SkipSetupWarningModal } from '../../SkipSetupWarningModal'; -import { SkipSetupButton } from '../../SkipSetupButton'; +import { useEffect, useMemo } from 'react'; import { useBreakpoint } from '../../../../hooks/breakpoint'; export function ButtonsControl() { @@ -49,8 +47,7 @@ export function ButtonsControl() { export function ManualProportionsPage() { const { isMobile } = useBreakpoint('mobile'); const { l10n } = useLocalization(); - const { applyProgress, skipSetup, state } = useOnboarding(); - const [skipWarning, setSkipWarning] = useState(false); + const { applyProgress, state } = useOnboarding(); applyProgress(0.9); @@ -68,11 +65,6 @@ export function ManualProportionsPage() { return ( <>
    - setSkipWarning(true)} - >
    @@ -118,11 +110,6 @@ export function ManualProportionsPage() { )}
    - setSkipWarning(false)} - isOpen={skipWarning} - > ); } diff --git a/gui/src/components/onboarding/pages/body-proportions/ProportionsChoose.tsx b/gui/src/components/onboarding/pages/body-proportions/ProportionsChoose.tsx index b7d87ddcd..55aa29d53 100644 --- a/gui/src/components/onboarding/pages/body-proportions/ProportionsChoose.tsx +++ b/gui/src/components/onboarding/pages/body-proportions/ProportionsChoose.tsx @@ -1,8 +1,6 @@ import { useOnboarding } from '../../../../hooks/onboarding'; import { useLocalization } from '@fluent/react'; import { useState } from 'react'; -import { SkipSetupWarningModal } from '../../SkipSetupWarningModal'; -import { SkipSetupButton } from '../../SkipSetupButton'; import classNames from 'classnames'; import { Typography } from '../../../commons/Typography'; import { Button } from '../../../commons/Button'; @@ -20,8 +18,7 @@ import { useIsTauri } from '../../../../hooks/breakpoint'; export function ProportionsChoose() { const isTauri = useIsTauri(); const { l10n } = useLocalization(); - const { applyProgress, skipSetup, state } = useOnboarding(); - const [skipWarning, setSkipWarning] = useState(false); + const { applyProgress, state } = useOnboarding(); const { useRPCPacket, sendRPCPacket } = useWebsocketAPI(); const [animated, setAnimated] = useState(false); @@ -58,11 +55,6 @@ export function ProportionsChoose() { return ( <>
    - setSkipWarning(true)} - >
    {l10n.getString('onboarding-choose_proportions')} @@ -191,11 +183,6 @@ export function ProportionsChoose() {
    - setSkipWarning(false)} - isOpen={skipWarning} - > ); } diff --git a/gui/src/components/onboarding/pages/mounting/AutomaticMounting.tsx b/gui/src/components/onboarding/pages/mounting/AutomaticMounting.tsx index 9967bc0cf..6f5ca73c9 100644 --- a/gui/src/components/onboarding/pages/mounting/AutomaticMounting.tsx +++ b/gui/src/components/onboarding/pages/mounting/AutomaticMounting.tsx @@ -6,9 +6,6 @@ import { MountingResetStep } from './mounting-steps/MountingReset'; import { PreparationStep } from './mounting-steps/Preparation'; import { PutTrackersOnStep } from './mounting-steps/PutTrackersOn'; import { useLocalization } from '@fluent/react'; -import { SkipSetupWarningModal } from '../../SkipSetupWarningModal'; -import { useState } from 'react'; -import { SkipSetupButton } from '../../SkipSetupButton'; const steps: Step[] = [ { type: 'numbered', component: PutTrackersOnStep }, @@ -18,19 +15,13 @@ const steps: Step[] = [ ]; export function AutomaticMountingPage() { const { l10n } = useLocalization(); - const { applyProgress, skipSetup, state } = useOnboarding(); - const [skipWarning, setSkipWarning] = useState(false); + const { applyProgress, state } = useOnboarding(); applyProgress(0.7); return ( <>
    - setSkipWarning(true)} - >
    @@ -48,11 +39,6 @@ export function AutomaticMountingPage() {
    - setSkipWarning(false)} - isOpen={skipWarning} - > ); } diff --git a/gui/src/components/onboarding/pages/mounting/ManualMounting.tsx b/gui/src/components/onboarding/pages/mounting/ManualMounting.tsx index 6b078baba..025ed8b00 100644 --- a/gui/src/components/onboarding/pages/mounting/ManualMounting.tsx +++ b/gui/src/components/onboarding/pages/mounting/ManualMounting.tsx @@ -11,16 +11,13 @@ import { Typography } from '../../../commons/Typography'; import { BodyAssignment } from '../../BodyAssignment'; import { MountingSelectionMenu } from './MountingSelectionMenu'; import { useLocalization } from '@fluent/react'; -import { SkipSetupWarningModal } from '../../SkipSetupWarningModal'; -import { SkipSetupButton } from '../../SkipSetupButton'; import { useBreakpoint } from '../../../../hooks/breakpoint'; export function ManualMountingPage() { const { isMobile } = useBreakpoint('mobile'); const { l10n } = useLocalization(); - const { applyProgress, skipSetup, state } = useOnboarding(); + const { applyProgress, state } = useOnboarding(); const { sendRPCPacket } = useWebsocketAPI(); - const [skipWarning, setSkipWarning] = useState(false); const [selectedRole, setSelectRole] = useState(BodyPart.NONE); @@ -70,11 +67,6 @@ export function ManualMountingPage() { onDirectionSelected={onDirectionSelected} >
    - setSkipWarning(true)} - >
    @@ -109,11 +101,6 @@ export function ManualMountingPage() {
    - setSkipWarning(false)} - isOpen={skipWarning} - > ); } diff --git a/gui/src/components/onboarding/pages/mounting/MountingChoose.tsx b/gui/src/components/onboarding/pages/mounting/MountingChoose.tsx index 4f3dd30b1..361fff557 100644 --- a/gui/src/components/onboarding/pages/mounting/MountingChoose.tsx +++ b/gui/src/components/onboarding/pages/mounting/MountingChoose.tsx @@ -2,7 +2,6 @@ import { useOnboarding } from '../../../../hooks/onboarding'; import { useLocalization } from '@fluent/react'; import { useState } from 'react'; import { SkipSetupWarningModal } from '../../SkipSetupWarningModal'; -import { SkipSetupButton } from '../../SkipSetupButton'; import classNames from 'classnames'; import { Typography } from '../../../commons/Typography'; import { Button } from '../../../commons/Button'; @@ -18,11 +17,6 @@ export function MountingChoose() { return ( <>
    - setSkipWarning(true)} - >
    diff --git a/gui/src/components/onboarding/pages/trackers-assign/TrackerAssignment.tsx b/gui/src/components/onboarding/pages/trackers-assign/TrackerAssignment.tsx index 222e3f2d0..a410ce097 100644 --- a/gui/src/components/onboarding/pages/trackers-assign/TrackerAssignment.tsx +++ b/gui/src/components/onboarding/pages/trackers-assign/TrackerAssignment.tsx @@ -26,8 +26,6 @@ import { Typography } from '../../../commons/Typography'; import { ASSIGNMENT_RULES, BodyAssignment } from '../../BodyAssignment'; import { NeckWarningModal } from '../../NeckWarningModal'; import { TrackerSelectionMenu } from './TrackerSelectionMenu'; -import { SkipSetupWarningModal } from '../../SkipSetupWarningModal'; -import { SkipSetupButton } from '../../SkipSetupButton'; import { useConfig } from '../../../../hooks/config'; import { playTapSetupSound } from '../../../../sounds/sounds'; import { useBreakpoint } from '../../../../hooks/breakpoint'; @@ -48,7 +46,7 @@ export function TrackersAssignPage() { const { isMobile } = useBreakpoint('mobile'); const { l10n } = useLocalization(); const { useAssignedTrackers, trackers } = useTrackers(); - const { applyProgress, skipSetup, state } = useOnboarding(); + const { applyProgress, state } = useOnboarding(); const { sendRPCPacket, useRPCPacket } = useWebsocketAPI(); const { control, watch } = useForm<{ advanced: boolean }>({ @@ -57,7 +55,6 @@ export function TrackersAssignPage() { const { advanced } = watch(); const [selectedRole, setSelectRole] = useState(BodyPart.NONE); const assignedTrackers = useAssignedTrackers(); - const [skipWarning, setSkipWarning] = useState(false); const { config } = useConfig(); const [tapDetectionSettings, setTapDetectionSettings] = useState closeChokerWarning(true)} accept={() => closeChokerWarning(false)} > -
    - setSkipWarning(true)} - > -
    @@ -330,11 +320,6 @@ export function TrackersAssignPage() {
    - setSkipWarning(false)} - isOpen={skipWarning} - > ); } diff --git a/server/core/src/main/java/dev/slimevr/serial/ProvisioningHandler.java b/server/core/src/main/java/dev/slimevr/serial/ProvisioningHandler.java index b61518e3a..f1ad23c88 100644 --- a/server/core/src/main/java/dev/slimevr/serial/ProvisioningHandler.java +++ b/server/core/src/main/java/dev/slimevr/serial/ProvisioningHandler.java @@ -164,6 +164,8 @@ public class ProvisioningHandler implements SerialListener { @Override public void onNewSerialDevice(SerialPort port) { + if (!isRunning) + return; this.initSerial(this.preferredPort); }