Improve routing

src/browser/app.tsx

@@ -1,35 +1,40 @@
+import { getBasepath, navigate } from "hookrouter"
 import * as React from "react"
-import { Application } from "../common/api"
-import { Route, Switch } from "react-router-dom"
+import { Application, isExecutableApplication } from "../common/api"
 import { HttpError } from "../common/http"
+import { normalize, Options } from "../common/util"
 import { Modal } from "./components/modal"
-import { getOptions } from "../common/util"
 
-const App: React.FunctionComponent = () => {
-  const [authed, setAuthed] = React.useState<boolean>(false)
-  const [app, setApp] = React.useState<Application>()
+export interface AppProps {
+  options: Options
+}
+
+const App: React.FunctionComponent<AppProps> = (props) => {
+  const [authed, setAuthed] = React.useState<boolean>(!!props.options.authed)
+  const [app, setApp] = React.useState<Application | undefined>(props.options.app)
   const [error, setError] = React.useState<HttpError | Error | string>()
 
   React.useEffect(() => {
-    getOptions()
-  }, [])
+    if (app && !isExecutableApplication(app)) {
+      navigate(normalize(`${getBasepath()}/${app.path}/`, true))
+    }
+  }, [app])
 
   if (typeof window !== "undefined") {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ;(window as any).setAuthed = setAuthed
+    ;(window as any).setAuthed = (a: boolean): void => {
+      if (authed !== a) {
+        setAuthed(a)
+      }
+    }
   }
 
   return (
     <>
-      <Switch>
-        <Route path="/vscode" render={(): React.ReactElement => <iframe id="iframe" src="/vscode-embed"></iframe>} />
-        <Route
-          path="/"
-          render={(): React.ReactElement => (
-            <Modal app={app} setApp={setApp} authed={authed} error={error} setError={setError} />
-          )}
-        />
-      </Switch>
+      <Modal app={app} setApp={setApp} authed={authed} error={error} setError={setError} />
+      {authed && app && app.embedPath ? (
+        <iframe id="iframe" src={normalize(`${getBasepath()}/${app.embedPath}/`, true)}></iframe>
+      ) : null}
     </>
   )
 }