diff --git a/components/Header/index.tsx b/components/Header/index.tsx index b0523281..c7d65516 100644 --- a/components/Header/index.tsx +++ b/components/Header/index.tsx @@ -9,7 +9,7 @@ import Link from 'next/link' import api from '~utils/api' import { accountState, initialAccountState } from '~utils/accountState' -import { appState, initialAppState } from '~utils/appState' +import { appState } from '~utils/appState' import capitalizeFirstLetter from '~utils/capitalizeFirstLetter' import { @@ -84,10 +84,6 @@ const Header = () => { setRightMenuOpen(false) } - function handleSettingsOpenChanged(open: boolean) { - setRightMenuOpen(false) - } - function copyToClipboard() { const el = document.createElement('input') el.value = window.location.href @@ -107,15 +103,6 @@ const Header = () => { // Push the root URL router.push(path) - // Clean state - const resetState = clonedeep(initialAppState) - Object.keys(resetState).forEach((key) => { - appState[key] = resetState[key] - }) - - // Set party to be editable - appState.party.editable = true - // Close right menu closeRightMenu() } diff --git a/pages/new/index.tsx b/pages/new/index.tsx index 650448bb..b3c2c225 100644 --- a/pages/new/index.tsx +++ b/pages/new/index.tsx @@ -1,7 +1,9 @@ import React, { useEffect } from 'react' +import { useRouter } from 'next/router' import Head from 'next/head' import { useTranslation } from 'next-i18next' import { serverSideTranslations } from 'next-i18next/serverSideTranslations' +import clonedeep from 'lodash.clonedeep' import Party from '~components/Party' @@ -9,7 +11,7 @@ import api from '~utils/api' import fetchLatestVersion from '~utils/fetchLatestVersion' import organizeRaids from '~utils/organizeRaids' import setUserToken from '~utils/setUserToken' -import { appState } from '~utils/appState' +import { appState, initialAppState } from '~utils/appState' import { groupWeaponKeys } from '~utils/groupWeaponKeys' import { printError } from '~utils/reportError' @@ -29,6 +31,9 @@ const NewRoute: React.FC = (props: Props) => { // Import translations const { t } = useTranslation('common') + // Set up router + const router = useRouter() + function callback(path: string) { // This is scuffed, how do we do this natively? window.history.replaceState(null, `Grid Tool`, `${path}`) @@ -38,6 +43,16 @@ const NewRoute: React.FC = (props: Props) => { persistStaticData() }, [persistStaticData]) + useEffect(() => { + // Clean state + const resetState = clonedeep(initialAppState) + Object.keys(resetState).forEach((key) => { + appState[key] = resetState[key] + }) + // Set party to be editable + appState.party.editable = true + }, []) + function persistStaticData() { appState.raids = props.raids appState.jobs = props.jobs @@ -47,7 +62,7 @@ const NewRoute: React.FC = (props: Props) => { } return ( - + {/* HTML */} {t('page.titles.new')} diff --git a/pages/p/[party].tsx b/pages/p/[party].tsx index 8ae2af4a..b7e16f22 100644 --- a/pages/p/[party].tsx +++ b/pages/p/[party].tsx @@ -70,7 +70,7 @@ const PartyRoute: React.FC = (props: Props) => { } return ( - +