fix: app loading in non-standalone mode

zextras · May 19, 2022 · a64a024 · a64a024
1 parent b904928
commit a64a024
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/src/boot/bootstrapper-router.tsx b/src/boot/bootstrapper-router.tsx
@@ -12,7 +12,7 @@ import { useBridge } from '../store/context-bridge';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import ShellView from '../shell/shell-view';
-import { BASENAME } from '../constants';
+import { BASENAME, IS_STANDALONE } from '../constants';
 import { useAppStore } from '../store/app';
 
 const ContextBridge: FC = () => {
@@ -41,11 +41,13 @@ const StandaloneListener: FC = () => {
 
 const BootstrapperRouter: FC = () => (
 	<BrowserRouter basename={BASENAME}>
-		<Switch>
-			<Route path={'/:route'}>
-				<StandaloneListener />
-			</Route>
-		</Switch>
+		{IS_STANDALONE && (
+			<Switch>
+				<Route path={'/:route'}>
+					<StandaloneListener />
+				</Route>
+			</Switch>
+		)}
 		<ContextBridge />
 		<AppLoaderMounter />
 		<ShellView />

diff --git a/src/shell/shell-view.jsx b/src/shell/shell-view.jsx
@@ -47,7 +47,6 @@ function DarkReaderListener() {
 
 const useLoginRedirection = (activeRoute) => {
 	const auth = useAccountStore((s) => s.authenticated);
-	console.log({ auth, activeRoute });
 	useEffect(() => {
 		if (IS_STANDALONE && !auth && activeRoute && !activeRoute.standalone?.allowUnauthenticated) {
 			goToLogin();

diff --git a/src/store/app/store.ts b/src/store/app/store.ts
@@ -7,7 +7,6 @@
 import produce from 'immer';
 import { filter, find, findIndex, merge, omit, reduce, sortBy, unionBy, unionWith } from 'lodash';
 import create, { StoreApi, UseBoundStore } from 'zustand';
-import { persist } from 'zustand/middleware';
 import {
 	AppRouteDescriptor,
 	AppState,