src/Home.tsx

@@ -14,12 +14,12 @@ import { atom, useAtomValue } from "jotai";
 import { createQueryAtom } from "./utils/query.ts";
 import { DiagnosticsCard } from "./components/DiagnosticsCard.tsx";
 
-const identityStringQueryAtom = createQueryAtom("api/identity", {
+const statusStringQueryAtom = createQueryAtom("status_string", "api/status", {
   refetchInterval: 500,
 });
-const identityStringAtom = atom((get) => {
-  const response = get(identityStringQueryAtom);
-  if (response.isPending || response.isError) {
+const statusStringAtom = atom((get) => {
+  const response = get(statusStringQueryAtom);
+  if (response.isPending || response.isError || !response.data.status) {
     return "N/A";
   }
   return response.data.message;
@@ -36,14 +36,16 @@ const uptimeAtom = atom((get) => {
   return response.data.uptime.toFixed(1);
 });
 
-function IdentityCard() {
-  const identityString = useAtomValue(identityStringAtom);
+function StatusCard() {
+  const statusString = useAtomValue(statusStringAtom);
   return (
-    <Card className="padded h-100">
-      <Card.Title>Identity</Card.Title>
-      <Card.Body>
-        <div style={{ whiteSpace: "pre-line" }}>{identityString}</div>
-      </Card.Body>
+    <Card className="padded">
+      <Row>
+        <p>Status:</p>
+      </Row>
+      <Row>
+        <p>{statusString}</p>
+      </Row>
     </Card>
   );
 }
@@ -51,11 +53,13 @@ function IdentityCard() {
 function UptimeCard() {
   const uptime = useAtomValue(uptimeAtom);
   return (
-    <Card className="padded h-100">
-      <Card.Title>Uptime</Card.Title>
-      <Card.Body>
+    <Card className="padded">
+      <Row>
+        <p>Uptime:</p>
+      </Row>
+      <Row>
         <p>{uptime}s</p>
-      </Card.Body>
+      </Row>
     </Card>
   );
 }
@@ -70,7 +74,7 @@ export function Home() {
             <UptimeCard />
           </Col>
           <Col>
-            <IdentityCard />
+            <StatusCard />
           </Col>
         </Row>
         <Row className="vert-padded">

src/Version.tsx

@@ -14,59 +14,35 @@ import { atom, useAtomValue } from "jotai";
 import { createQueryAtom } from "./utils/query.ts";
 import YAML from "yaml";
 
-const buildInfoQueryAtom = createQueryAtom("api/build_info");
-const buildInfoAtom = atom((get) => {
-  const buildInfo = get(buildInfoQueryAtom);
-  if (buildInfo.isPending) {
+const versionQueryAtom = createQueryAtom("api/build_info");
+
+const versionAtom = atom((get) => {
+  const version = get(versionQueryAtom);
+  if (version.isPending) {
     return "Loading...";
   }
-  if (buildInfo.isError) {
+  if (version.isError) {
     return "Error loading!";
   }
-  if (!buildInfo.data.status) {
-    return "Can not find buildInfo";
+  if (!version.data.status) {
+    return "Can not find version";
   }
-  return YAML.stringify(buildInfo.data.message);
-});
-
-const versionNumberQueryAtom = createQueryAtom("api/version_number");
-const versionNumberAtom = atom((get) => {
-  const versionNumber = get(versionNumberQueryAtom);
-  if (versionNumber.isPending || versionNumber.isError) {
-    return "...";
-  }
-  if (!versionNumber.data.status) {
-    return "Can not find version number.";
-  }
-  return versionNumber.data.version;
+  return YAML.stringify(version.data.message);
 });
 
 export function Version() {
-  let buildInfoText = useAtomValue(buildInfoAtom);
-  let versionText = useAtomValue(versionNumberAtom);
+  let versionText = useAtomValue(versionAtom);
 
   return (
     <div>
       <AppNav />
       <Container className="vert-padded">
-        <Row>
-          <Col>
-            <Card className="padded">
-              <Card.Title>Version Number</Card.Title>
-              <Card.Body>{versionText}</Card.Body>
-            </Card>
-          </Col>
-        </Row>
-        <Row className="vert-padded">
-          <Col>
         <Card className="padded">
           <Card.Title>project.yaml</Card.Title>
           <Card.Body>
-                <pre>{buildInfoText}</pre>
+            <pre>{versionText}</pre>
           </Card.Body>
         </Card>
-          </Col>
-        </Row>
       </Container>
       <Footer />
     </div>

src/Video.tsx

@@ -11,67 +11,26 @@
 import { AppNav, Footer } from "./components/AppNav.tsx";
 import { Container, Row, Col, Card } from "react-bootstrap";
 import { MediaMtxPlayer } from "./external/MediaMtxPlayer.tsx";
-import { atom, useAtomValue, useAtom } from "jotai";
+import { atom, useAtomValue } from "jotai";
 import { createQueryAtom } from "./utils/query.ts";
 
 const tokenQueryAtom = createQueryAtom("api/mediamtx/login", { retry: true });
 const tokenAtom = atom((get) => {
   const response = get(tokenQueryAtom);
   if (response.isPending || response.isError) {
+    console.log(response);
     return null;
   }
   return response.data.token;
 });
 
-const streamsQueryAtom = createQueryAtom("api/available_streams");
-const streamsAtom = atom((get) => {
-  const response = get(streamsQueryAtom);
-  if (response.isPending || response.isError) {
-    return [];
-  }
-  return response.data.streams;
-});
-const videoDisplayPortAtom = atom((get) => {
-  const response = get(streamsQueryAtom);
-  if (response.isPending || response.isError) {
-    return null;
-  }
-  return response.data.port;
-});
-
-const selectedStreamAtom = atom("image");
-const imageStreamURIAtom = atom((get) => {
-  const port = get(videoDisplayPortAtom);
-  const selectedStream = get(selectedStreamAtom);
-  if (port === null || selectedStream === null) {
-    return null;
-  }
-  const imageStreamURI =
-    "http://" +
-    window.location.hostname +
-    ":" +
-    port +
-    "/" +
-    selectedStream +
-    "/whep";
-  return imageStreamURI;
-});
-
 export function Video() {
   const streamName = "image";
-
-  const imageStreamURI = useAtomValue(imageStreamURIAtom);
+  const imageStreamURI =
+    "http://" + window.location.hostname + ":8889/" + streamName + "/whep";
 
   const token = useAtomValue(tokenAtom);
 
-  const availableStreams = useAtomValue(streamsAtom);
-
-  const [selectedStream, setSelectedStream] = useAtom(selectedStreamAtom);
-
-  const handleSelect = (event) => {
-    setSelectedStream(event.target.value);
-  };
-
   return (
     <div>
       <AppNav />
@@ -81,21 +40,7 @@ export function Video() {
             <Col lg={8}>
               <MediaMtxPlayer url={imageStreamURI} token={token} />
             </Col>
-            <Col lg={4}>
-              <p>Available Streams: </p>
-              {availableStreams.map((stream, index) => (
-                <div style={{ display: "flex", gap: "8px" }}>
-                  <input
-                    type="radio"
-                    name="selected_stream"
-                    value={stream}
-                    checked={selectedStream === stream}
-                    onChange={handleSelect}
-                  />
-                  {stream}
-                </div>
-              ))}
-            </Col>
+            <Col lg={4}>Showing stream: "{streamName}".</Col>
           </Row>
         </Card>
       </Container>

src/components/AppNav.tsx

@@ -16,7 +16,7 @@ export function AppNav() {
     <Navbar bg="dark" variant="dark" expand="sm" className="py-0">
       <Container className="me-auto">
         <Navbar.Brand as={Link} to="/">
-          am_i_up
+          J7s-Bridge
         </Navbar.Brand>
         <Navbar.Toggle aria-controls="collapse-navbar-nav" />
         <Navbar.Collapse id="collapse-navbar-nav">

src/components/DiagnosticsCard.tsx

@@ -71,15 +71,11 @@ function LevelIndicator(props: Any) {
   return <CircleFill color="grey" />;
 }
 
-function TitleText(props: Any) {
+function MessageText(props: Any) {
   if (props.message === "") {
-    return <p>{props.name}</p>;
+    return <div></div>;
   }
-  return (
-    <p>
-      {props.name}: {props.message}
-    </p>
-  );
+  return <div>Message: {props.message}</div>;
 }
 
 function ValuesTable(props: Any) {
@@ -107,9 +103,13 @@ function ValuesTable(props: Any) {
 
 function StatusContent(props: Any) {
   const status = props.status;
+  console.log(status);
   return (
     <div>
-      <TitleText name={status.name} message={status.message} />
+      <p>{status.name}</p>
+      <p>
+        <MessageText message={status.message} />
+      </p>
       <p>
         <ValuesTable values={status.values} />
       </p>