diff --git a/web/pages/hardware-info.tsx b/web/pages/hardware-info.tsx index 3bb3206cb..58995c20c 100644 --- a/web/pages/hardware-info.tsx +++ b/web/pages/hardware-info.tsx @@ -1,8 +1,8 @@ /* eslint-disable no-array-constructor */ -import React, { useState, useEffect } from 'react'; +import { BulbOutlined, LaptopOutlined, SaveOutlined } from "@ant-design/icons"; import { Row } from "antd"; -import {LaptopOutlined, BulbOutlined, SaveOutlined} from "@ant-design/icons" -import { HARDWARE_STATS, fetchData, FETCH_INTERVAL } from '../utils/apis'; +import React, { useEffect, useState } from 'react'; +import { fetchData, FETCH_INTERVAL, HARDWARE_STATS } from '../utils/apis'; import Chart from './components/chart'; import StatisticItem from "./components/statistic"; diff --git a/web/pages/index.tsx b/web/pages/index.tsx index 112108a22..d580cd576 100644 --- a/web/pages/index.tsx +++ b/web/pages/index.tsx @@ -21,65 +21,14 @@ import { LOGS_WARN, fetchData, FETCH_INTERVAL, + LOGS_ALL, } from "../utils/apis"; import { formatIPAddress, isEmptyObject } from "../utils/format"; import OwncastLogo from "./components/logo" const { Title } = Typography; -function Offline() { - const data = [ - { - title: "Send some test content", - content: ( -
- With any video you have around you can pass it to the test script and start streaming it. -
- ./test/ocTestStream.sh yourVideo.mp4 -
-
- ), - }, - { - title: "Use your broadcasting software", - content: ( -
- Learn how to point your existing software to your new server and start streaming your content. -
- ) - }, - { - title: "Something else", - }, - ]; - return ( -
- } - title="No stream is active." - subTitle="You should start one." - /> - ( - - {item.content} - - )} - /> -
- ); -} export default function Stats() { const context = useContext(ServerStatusContext); @@ -153,6 +102,9 @@ export default function Stats() { ); } + const logTable = logs.length > 0 ? : null + console.log(logs) + if (!broadcaster) { return ; } @@ -181,7 +133,6 @@ export default function Stats() { ); }); - const logTable = logs.length > 0 ? : null const { viewerCount, sessionMaxViewerCount } = stats; const streamVideoDetailString = `${streamDetails.videoCodec} ${streamDetails.videoBitrate} kbps ${streamDetails.width}x${streamDetails.height}`; const streamAudioDetailString = `${streamDetails.audioCodec} ${streamDetails.audioBitrate} kpbs`; @@ -246,4 +197,59 @@ export default function Stats() { {logTable} ); + + function Offline() { + const data = [ + { + title: "Send some test content", + content: ( +
+ With any video you have around you can pass it to the test script and start streaming it. +
+ ./test/ocTestStream.sh yourVideo.mp4 +
+
+ ), + }, + { + title: "Use your broadcasting software", + content: ( +
+ Learn how to point your existing software to your new server and start streaming your content. +
+ ) + }, + { + title: "Something else", + }, + ]; + return ( +
+ } + title="No stream is active." + subTitle="You should start one." + /> + + ( + + {item.content} + + )} + /> + {logTable} +
+ ); + } }