diff --git a/client/web/src/components/app.tsx b/client/web/src/components/app.tsx
index aefa81a7d..41f5e5c2e 100644
--- a/client/web/src/components/app.tsx
+++ b/client/web/src/components/app.tsx
@@ -8,7 +8,7 @@ import useAuth, { AuthResponse } from "src/hooks/auth"
import useNodeData, { NodeData, NodeUpdate } from "src/hooks/node-data"
import { ReactComponent as TailscaleIcon } from "src/icons/tailscale-icon.svg"
import ProfilePic from "src/ui/profile-pic"
-import { Link, Route, Switch, useLocation } from "wouter"
+import { Link, Route, Router, Switch, useLocation } from "wouter"
import DeviceDetailsView from "./views/device-details-view"
export default function App() {
@@ -46,30 +46,32 @@ function WebClient({
{/* TODO(sonia): get rid of the conditions here once full/readonly
* views live on same components */}
{data.DebugMode === "full" && auth?.ok && }
-
-
-
-
- {data.DebugMode !== "" && (
- <>
-
-
-
- {/* TODO */}Subnet router
- {/* TODO */}Tailscale SSH server
- {/* TODO */}Share local content
- >
- )}
-
- Page not found
-
-
+
+
+
+
+
+ {data.DebugMode !== "" && (
+ <>
+
+
+
+ {/* TODO */}Subnet router
+ {/* TODO */}Tailscale SSH server
+ {/* TODO */}Share local content
+ >
+ )}
+
+ Page not found
+
+
+
>
)
}
diff --git a/client/web/src/hooks/node-data.ts b/client/web/src/hooks/node-data.ts
index 613f72d39..73657a19f 100644
--- a/client/web/src/hooks/node-data.ts
+++ b/client/web/src/hooks/node-data.ts
@@ -15,6 +15,7 @@ export type NodeData = {
IsUnraid: boolean
UnraidToken: string
IPNVersion: string
+ URLPrefix: string
DebugMode: "" | "login" | "full" // empty when not running in any debug mode
}
diff --git a/client/web/web.go b/client/web/web.go
index f81282af2..271b648ea 100644
--- a/client/web/web.go
+++ b/client/web/web.go
@@ -504,6 +504,7 @@ type nodeData struct {
UnraidToken string
IPNVersion string
DebugMode string // empty when not running in any debug mode
+ URLPrefix string // if set, the URL prefix the client is served behind
}
func (s *Server) serveGetNodeData(w http.ResponseWriter, r *http.Request) {
@@ -537,6 +538,7 @@ func (s *Server) serveGetNodeData(w http.ResponseWriter, r *http.Request) {
IsUnraid: distro.Get() == distro.Unraid,
UnraidToken: os.Getenv("UNRAID_CSRF_TOKEN"),
IPNVersion: versionShort,
+ URLPrefix: strings.TrimSuffix(s.pathPrefix, "/"),
DebugMode: debugMode, // TODO(sonia,will): just pass back s.mode directly?
}
for _, r := range prefs.AdvertiseRoutes {