diff --git a/src-web/components/AppRouter.tsx b/src-web/components/AppRouter.tsx index 3087a956..448e2d96 100644 --- a/src-web/components/AppRouter.tsx +++ b/src-web/components/AppRouter.tsx @@ -1,13 +1,5 @@ -import { useEffect } from 'react'; -import { - createBrowserRouter, - Navigate, - Outlet, - RouterProvider, - useLocation, -} from 'react-router-dom'; +import { createBrowserRouter, Navigate, RouterProvider } from 'react-router-dom'; import { routePaths } from '../hooks/useRoutes'; -import { setLastLocation } from '../lib/lastLocation'; import RouteError from './RouteError'; import Workspace from './Workspace'; import Workspaces from './Workspaces'; @@ -16,7 +8,6 @@ const router = createBrowserRouter([ { path: '/', errorElement: , - element: , children: [ { path: '/', @@ -44,11 +35,3 @@ const router = createBrowserRouter([ export function AppRouter() { return ; } - -function RouterRoot() { - const { pathname } = useLocation(); - useEffect(() => { - setLastLocation(pathname).catch(console.error); - }, [pathname]); - return ; -} diff --git a/src-web/lib/lastLocation.ts b/src-web/lib/lastLocation.ts deleted file mode 100644 index 45719aee..00000000 --- a/src-web/lib/lastLocation.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { getKeyValue, NAMESPACE_NO_SYNC, setKeyValue } from './keyValueStore'; - -export async function getLastLocation(): Promise { - return getKeyValue({ namespace: NAMESPACE_NO_SYNC, key: 'last_location', fallback: '/' }); -} - -export async function setLastLocation(pathname: string): Promise { - return setKeyValue({ namespace: NAMESPACE_NO_SYNC, key: 'last_location', value: pathname }); -} - -export async function syncLastLocation(): Promise { - const lastPathname = await getLastLocation(); - if (lastPathname !== window.location.pathname) { - console.log(`Redirecting to last location: ${lastPathname}`); - window.location.assign(lastPathname); - } -} diff --git a/src-web/main.tsx b/src-web/main.tsx index 91413013..7ffce4b8 100644 --- a/src-web/main.tsx +++ b/src-web/main.tsx @@ -2,12 +2,10 @@ import { StrictMode } from 'react'; import { createRoot } from 'react-dom/client'; import { App } from './components/App'; import { getKeyValue } from './lib/keyValueStore'; -import { syncLastLocation } from './lib/lastLocation'; import { getPreferredAppearance, setAppearance } from './lib/theme/window'; import './main.css'; setAppearance(await getKeyValue({ key: 'appearance', fallback: getPreferredAppearance() })); -await syncLastLocation(); // root holds our app's root DOM Element: createRoot(document.getElementById('root') as HTMLElement).render(