This commit is contained in:
Viktor Rådberg
2023-12-27 21:03:22 +01:00
parent 00bda4fb68
commit 2ca6b91d09
2 changed files with 15 additions and 4 deletions

View File

@@ -8,7 +8,11 @@ import { useAnalytics } from '../../../Hooks/useAnalytics';
import { useGlobalSettings } from '../../../Hooks/useGlobalSettings'; import { useGlobalSettings } from '../../../Hooks/useGlobalSettings';
import { usePlayers } from '../../../Hooks/usePlayers'; import { usePlayers } from '../../../Hooks/usePlayers';
import { Cog, Info } from '../../../Icons/generated'; import { Cog, Info } from '../../../Icons/generated';
import { InitialGameSettings, Orientation } from '../../../Types/Settings'; import {
GameFormat,
InitialGameSettings,
Orientation,
} from '../../../Types/Settings';
import { InfoModal } from '../../Misc/InfoModal'; import { InfoModal } from '../../Misc/InfoModal';
import { SettingsModal } from '../../Misc/SettingsModal'; import { SettingsModal } from '../../Misc/SettingsModal';
import { Spacer } from '../../Misc/Spacer'; import { Spacer } from '../../Misc/Spacer';
@@ -118,7 +122,7 @@ const Start = () => {
startingLifeTotal: 40, startingLifeTotal: 40,
useCommanderDamage: true, useCommanderDamage: true,
orientation: Orientation.Portrait, orientation: Orientation.Portrait,
gameFormat: 'commander', gameFormat: GameFormat.Commander,
} }
); );

View File

@@ -60,7 +60,10 @@ export const GlobalSettingsProvider = ({
useEffect(() => { useEffect(() => {
console.log('initialGameSettings', JSON.parse(savedGameSettings as string)); console.log('initialGameSettings', JSON.parse(savedGameSettings as string));
if (JSON.parse(savedGameSettings as string).gridArea) {
if (savedGameSettings && JSON.parse(savedGameSettings).gridAreas) {
console.log('lmao1');
removeLocalStorage(); removeLocalStorage();
return; return;
} }
@@ -68,15 +71,19 @@ export const GlobalSettingsProvider = ({
//parse existing game settings with zod schema //parse existing game settings with zod schema
const parsedInitialGameSettings = const parsedInitialGameSettings =
InitialGameSettingsSchema.safeParse(initialGameSettings); InitialGameSettingsSchema.safeParse(initialGameSettings);
console.log('lmao2');
if (!parsedInitialGameSettings.success) { if (!parsedInitialGameSettings.success) {
console.log('lmao3');
removeLocalStorage(); removeLocalStorage();
return; return;
} }
console.log('llam');
localStorage.setItem( localStorage.setItem(
'initialGameSettings', 'initialGameSettings',
JSON.stringify(parsedInitialGameSettings.data) JSON.stringify(initialGameSettings)
); );
}, [initialGameSettings]); }, [initialGameSettings]);