diff --git a/gui/src/components/onboarding/pages/mounting/ManualMounting.tsx b/gui/src/components/onboarding/pages/mounting/ManualMounting.tsx
index 8b6ac657bc..78287a7676 100644
--- a/gui/src/components/onboarding/pages/mounting/ManualMounting.tsx
+++ b/gui/src/components/onboarding/pages/mounting/ManualMounting.tsx
@@ -13,14 +13,14 @@ import { MountingSelectionMenu } from './MountingSelectionMenu';
import { useLocalization } from '@fluent/react';
import { useBreakpoint } from '@/hooks/breakpoint';
import { Quaternion } from 'three';
-import { useConfig } from '@/hooks/config';
+import { defaultConfig, useConfig } from '@/hooks/config';
export function ManualMountingPage() {
const { isMobile } = useBreakpoint('mobile');
const { l10n } = useLocalization();
const { applyProgress, state } = useOnboarding();
const { sendRPCPacket } = useWebsocketAPI();
- const { setConfig } = useConfig();
+ const { setConfig, config } = useConfig();
const [selectedRole, setSelectRole] = useState
(BodyPart.NONE);
@@ -102,6 +102,7 @@ export function ManualMountingPage() {
({
- defaultValues: { advanced: config?.advancedAssign ?? false },
+ const { control, watch } = useForm<{
+ advanced: boolean;
+ mirrorView: boolean;
+ }>({
+ defaultValues: {
+ advanced: config?.advancedAssign ?? false,
+ mirrorView: config?.mirrorView ?? true,
+ },
});
- const { advanced } = watch();
+ const { advanced, mirrorView } = watch();
const [selectedRole, setSelectRole] = useState(BodyPart.NONE);
const assignedTrackers = useAssignedTrackers();
useEffect(() => {
- setConfig({ advancedAssign: advanced });
- }, [advanced]);
+ setConfig({ advancedAssign: advanced, mirrorView });
+ }, [advanced, mirrorView]);
const [tapDetectionSettings, setTapDetectionSettings] = useState LOWER_BODY.has(t))
+ ) {
+ return;
+ }
+
if (unassignedRoles.every(([, state]) => state)) return;
return {
@@ -277,12 +292,22 @@ export function TrackersAssignPage() {
{l10n.getString('tips-find_tracker')}
-
+
+
+
+
{!!firstError && (
@@ -320,6 +345,7 @@ export function TrackersAssignPage() {
highlightedRoles={firstError?.affectedRoles || []}
rolesWithErrors={rolesWithErrors}
advanced={advanced}
+ mirror={mirrorView}
onRoleSelected={tryOpenChokerWarning}
>
diff --git a/gui/src/components/tracker/SingleTrackerBodyAssignmentMenu.tsx b/gui/src/components/tracker/SingleTrackerBodyAssignmentMenu.tsx
index e90734bdd2..3a6cd374cb 100644
--- a/gui/src/components/tracker/SingleTrackerBodyAssignmentMenu.tsx
+++ b/gui/src/components/tracker/SingleTrackerBodyAssignmentMenu.tsx
@@ -10,6 +10,7 @@ import { useLocalization } from '@fluent/react';
import { NeckWarningModal } from '@/components/onboarding/NeckWarningModal';
import { useChokerWarning } from '@/hooks/choker-warning';
import { useBreakpoint } from '@/hooks/breakpoint';
+import { defaultConfig, useConfig } from '@/hooks/config';
export function SingleTrackerBodyAssignmentMenu({
isOpen,
@@ -22,6 +23,7 @@ export function SingleTrackerBodyAssignmentMenu({
}) {
const { isMobile } = useBreakpoint('mobile');
const { l10n } = useLocalization();
+ const { config } = useConfig();
const { control, watch } = useForm<{ advanced: boolean }>({
defaultValues: { advanced: false },
});
@@ -75,6 +77,7 @@ export function SingleTrackerBodyAssignmentMenu({
{
+ const state = localStorage.getItem('skeletonModelPreview');
+ if (state) setEnabled(state === 'true');
+ }, []);
+
return (
<>
{!enabled && (
@@ -96,7 +101,7 @@ export function ToggleableSkeletonVisualizerWidget(
className="w-full"
onClick={() => {
setEnabled(true);
- localStorage.setItem('modelPreview', 'true');
+ localStorage.setItem('skeletonModelPreview', 'true');
}}
>
{l10n.getString('widget-skeleton_visualizer-preview')}
@@ -109,7 +114,7 @@ export function ToggleableSkeletonVisualizerWidget(
variant="secondary"
onClick={() => {
setEnabled(false);
- localStorage.setItem('modelPreview', 'false');
+ localStorage.setItem('skeletonModelPreview', 'false');
}}
>
{l10n.getString('widget-skeleton_visualizer-hide')}
diff --git a/gui/src/hooks/config.ts b/gui/src/hooks/config.ts
index 58008e627f..63246d4df1 100644
--- a/gui/src/hooks/config.ts
+++ b/gui/src/hooks/config.ts
@@ -28,6 +28,7 @@ export interface Config {
advancedAssign: boolean;
useTray: boolean | null;
doneManualMounting: boolean;
+ mirrorView: boolean;
}
export interface ConfigContext {
@@ -51,6 +52,7 @@ export const defaultConfig: Omit = {
advancedAssign: false,
useTray: null,
doneManualMounting: false,
+ mirrorView: true,
};
function fallbackToDefaults(loadedConfig: any): Config {
diff --git a/gui/src/hooks/wifi-form.tsx b/gui/src/hooks/wifi-form.tsx
index f1f616be64..28a24f9426 100644
--- a/gui/src/hooks/wifi-form.tsx
+++ b/gui/src/hooks/wifi-form.tsx
@@ -5,7 +5,7 @@ import { useOnboarding } from './onboarding';
export interface WifiFormData {
ssid: string;
- password: string;
+ password?: string;
}
export function useWifiForm() {
@@ -27,7 +27,7 @@ export function useWifiForm() {
}, []);
const submitWifiCreds = (value: WifiFormData) => {
- setWifiCredentials(value.ssid, value.password);
+ setWifiCredentials(value.ssid, value.password ?? '');
navigate('/onboarding/connect-trackers', {
state: { alonePage: state.alonePage },
});
diff --git a/server/core/src/main/java/io/eiren/util/OperatingSystem.kt b/server/core/src/main/java/io/eiren/util/OperatingSystem.kt
index 0b0a66fd70..b93d8edac1 100644
--- a/server/core/src/main/java/io/eiren/util/OperatingSystem.kt
+++ b/server/core/src/main/java/io/eiren/util/OperatingSystem.kt
@@ -52,8 +52,8 @@ enum class OperatingSystem(
}
fun resolveLogDirectory(identifier: String): Path? = when (currentPlatform) {
- LINUX -> System.getenv("XDG_CONFIG_HOME")?.let { Path(it, identifier, "logs") }
- ?: System.getenv("HOME")?.let { Path(it, ".config", identifier, "logs") }
+ LINUX -> System.getenv("XDG_DATA_HOME")?.let { Path(it, identifier, "logs") }
+ ?: System.getenv("HOME")?.let { Path(it, ".local", "share", identifier, "logs") }
WINDOWS -> System.getenv("AppData")?.let { Path(it, identifier, "logs") }
OSX -> System.getenv("HOME")?.let { Path(it, "Library", "Logs", identifier) }
UNKNOWN -> null