LogalDeveloper/owncast
0
Fork 0
Code Activity

Merge branch 'master' of github.com:owncast/owncast-admin

Browse Source
This commit is contained in:
gingervitis
2020-10-31 23:17:55 -07:00
parent de44f8b99d 09bcb54ba4
commit 27f4b8b158
2 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web/pages/components/log-table.tsx
View File

@@ -69,6 +69,7 @@ export default function LogTable({ logs, pageSize }) {
return ( return (
<div> <div>
<Table <Table
size="middle"
dataSource={logs} dataSource={logs}
columns={columns} columns={columns}
rowKey={(row) => row.time} rowKey={(row) => row.time}

19
web/pages/components/main-layout.tsx
View File

@@ -69,14 +69,11 @@ export default function MainLayout(props) {
<SubMenu <SubMenu
key="current-stream-menu" key="current-stream-menu"
icon={<LineChartOutlined />} icon={<LineChartOutlined />}
title="Stream Details" title="Current stream"
> >
<Menu.Item key="viewer-info"> <Menu.Item key="viewer-info">
<Link href="/viewer-info">Viewers</Link> <Link href="/viewer-info">Viewers</Link>
</Menu.Item> </Menu.Item>
<Menu.Item key="hardware-info">
<Link href="/hardware-info">Hardware</Link>
</Menu.Item>
{broadcastActive ? ( {broadcastActive ? (
<Menu.Item key="disconnect-stream" icon={<CloseCircleOutlined />}> <Menu.Item key="disconnect-stream" icon={<CloseCircleOutlined />}>
<Link href="/disconnect-stream">Disconnect Stream...</Link> <Link href="/disconnect-stream">Disconnect Stream...</Link>
@@ -85,9 +82,9 @@ export default function MainLayout(props) {
</SubMenu> </SubMenu>
<SubMenu <SubMenu
key="utilities-menu" key="configuration"
title="Configuration"
icon={<SettingOutlined />} icon={<SettingOutlined />}
title="Utilities"
> >
<Menu.Item key="update-server-config"> <Menu.Item key="update-server-config">
<Link href="/update-server-config">Server Configuration</Link> <Link href="/update-server-config">Server Configuration</Link>
@@ -98,6 +95,16 @@ export default function MainLayout(props) {
<Menu.Item key="storage"> <Menu.Item key="storage">
<Link href="/storage">Storage</Link> <Link href="/storage">Storage</Link>
</Menu.Item> </Menu.Item>
</SubMenu>
<SubMenu
key="utilities-menu"
icon={<SettingOutlined />}
title="Utilities"
>
<Menu.Item key="hardware-info">
<Link href="/hardware-info">Hardware</Link>
</Menu.Item>
<Menu.Item key="logs"> <Menu.Item key="logs">
<Link href="/logs">Logs</Link> <Link href="/logs">Logs</Link>
</Menu.Item> </Menu.Item>