aljaz/mutiny-web
1
0
Fork 0
mirror of https://github.com/aljazceru/mutiny-web.git synced 2025-12-17 06:14:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

Maybe fix appUrlOpen

Browse Source
This commit is contained in:
benthecarman
2024-06-10 14:04:50 -05:00
committed by Tony Giorgio
parent 850e3478be
commit 65fe31c72f
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/router.tsx
View File

@@ -74,20 +74,6 @@ if (Capacitor.isNativePlatform()) {
function ChildrenOrError(props: { children: JSX.Element }) {
const [state] = useMegaStore();
return (
<Switch>
<Match when={state.setup_error}>
<SetupErrorDisplay
initialError={state.setup_error!}
password={state.password}
/>
</Match>
<Match when={true}>{props.children}</Match>
</Switch>
);
}
export function Router() {
// listeners for native navigation handling
// Check if the platform is Android to handle back
onMount(async () => {
@@ -120,10 +106,15 @@ export function Router() {
const path = url.pathname;
const urlParams = new URLSearchParams(url.search);
console.log(
`Navigating to ${path}?${urlParams.toString()}`
);
navigate(`${path}?${urlParams.toString()}`);
if (urlParams.size) {
console.log(
`Navigating to ${path}?${urlParams.toString()}`
);
navigate(`${path}?${urlParams.toString()}`);
} else {
console.log(`Navigating to ${path}`);
navigate(path);
}
}
);
@@ -133,6 +124,21 @@ export function Router() {
});
}
});
return (
<Switch>
<Match when={state.setup_error}>
<SetupErrorDisplay
initialError={state.setup_error!}
password={state.password}
/>
</Match>
<Match when={true}>{props.children}</Match>
</Switch>
);
}
export function Router() {
return (
<SolidRouter
root={(props) => (