Add stream duration to layout header
This commit is contained in:
@@ -1,4 +1,3 @@
|
|||||||
import 'antd/dist/antd.dark.css';
|
|
||||||
import 'antd/dist/antd.compact.css';
|
import 'antd/dist/antd.compact.css';
|
||||||
import "../styles/globals.scss";
|
import "../styles/globals.scss";
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import React from "react";
|
import React from "react";
|
||||||
import { timeFormat } from "d3-time-format";
|
import { timeFormat } from "d3-time-format";
|
||||||
import { Table, } from "antd";
|
import { Table, Tag} from "antd";
|
||||||
import Linkify from "react-linkify";
|
import Linkify from "react-linkify";
|
||||||
import { SortOrder } from "antd/lib/table/interface";
|
import { SortOrder } from "antd/lib/table/interface";
|
||||||
|
|
||||||
@@ -13,10 +13,7 @@ function renderColumnLevel(text, entry) {
|
|||||||
color = "red";
|
color = "red";
|
||||||
}
|
}
|
||||||
|
|
||||||
const style = {
|
return <Tag color={color}>{text}</Tag>;
|
||||||
color,
|
|
||||||
};
|
|
||||||
return <div style={style}>{text}</div>;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderMessage(text) {
|
function renderMessage(text) {
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
import React, { useContext } from 'react';
|
import React, { useContext } from 'react';
|
||||||
import PropTypes from 'prop-types';
|
import PropTypes from 'prop-types';
|
||||||
import Link from 'next/link';
|
import Link from 'next/link';
|
||||||
|
import { differenceInSeconds } from "date-fns";
|
||||||
import { useRouter } from 'next/router';
|
import { useRouter } from 'next/router';
|
||||||
import { Layout, Menu } from 'antd';
|
import { Layout, Menu } from 'antd';
|
||||||
import {
|
import {
|
||||||
@@ -12,7 +13,7 @@ import {
|
|||||||
MinusSquareFilled,
|
MinusSquareFilled,
|
||||||
} from '@ant-design/icons';
|
} from '@ant-design/icons';
|
||||||
import classNames from 'classnames';
|
import classNames from 'classnames';
|
||||||
|
import {parseSecondsToDurationString} from '../../utils/format'
|
||||||
|
|
||||||
import OwncastLogo from './logo';
|
import OwncastLogo from './logo';
|
||||||
import { BroadcastStatusContext } from '../../utils/broadcast-status-context';
|
import { BroadcastStatusContext } from '../../utils/broadcast-status-context';
|
||||||
@@ -31,10 +32,14 @@ export default function MainLayout(props) {
|
|||||||
const { Header, Footer, Content, Sider } = Layout;
|
const { Header, Footer, Content, Sider } = Layout;
|
||||||
const { SubMenu } = Menu;
|
const { SubMenu } = Menu;
|
||||||
|
|
||||||
|
const streamDurationString = broadcastActive ?
|
||||||
|
parseSecondsToDurationString(differenceInSeconds(new Date(), new Date(context.broadcaster.time))) : ""
|
||||||
|
|
||||||
const statusIcon = broadcastActive ?
|
const statusIcon = broadcastActive ?
|
||||||
<PlayCircleFilled /> : <MinusSquareFilled />;
|
<PlayCircleFilled /> : <MinusSquareFilled />;
|
||||||
const statusMessage = broadcastActive ?
|
const statusMessage = broadcastActive
|
||||||
'Online' : 'Offline';
|
? `Online ${ streamDurationString}`
|
||||||
|
: "Offline";
|
||||||
|
|
||||||
const appClass = classNames({
|
const appClass = classNames({
|
||||||
'owncast-layout': true,
|
'owncast-layout': true,
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
/* eslint-disable react/prop-types */
|
/* eslint-disable react/prop-types */
|
||||||
import React, { useState, useEffect, useContext } from 'react';
|
import React, { useState, useEffect, useContext } from 'react';
|
||||||
import { timeFormat } from "d3-time-format";
|
|
||||||
import { Table, Row } from "antd";
|
import { Table, Row } from "antd";
|
||||||
import { formatDistanceToNow } from "date-fns";
|
import { formatDistanceToNow } from "date-fns";
|
||||||
import { UserOutlined} from "@ant-design/icons";
|
import { UserOutlined} from "@ant-design/icons";
|
||||||
|
|||||||
@@ -17,3 +17,25 @@ export function formatIPAddress(ipAddress: string): string {
|
|||||||
export function isEmptyObject(obj) {
|
export function isEmptyObject(obj) {
|
||||||
return !obj || Object.keys(obj).length === 0;
|
return !obj || Object.keys(obj).length === 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export function parseSecondsToDurationString(seconds = 0) {
|
||||||
|
const finiteSeconds = Number.isFinite(+seconds) ? Math.abs(seconds) : 0;
|
||||||
|
|
||||||
|
const days = Math.floor(finiteSeconds / 86400);
|
||||||
|
const daysString = days > 0 ? `${days} day${days > 1 ? 's' : ''} ` : '';
|
||||||
|
|
||||||
|
const hours = Math.floor((finiteSeconds / 3600) % 24);
|
||||||
|
const hoursString = hours || days ? padLeft(`${hours}:`, '0', 3) : '';
|
||||||
|
|
||||||
|
const mins = Math.floor((finiteSeconds / 60) % 60);
|
||||||
|
const minString = padLeft(`${mins}:`, '0', 3);
|
||||||
|
|
||||||
|
const secs = Math.floor(finiteSeconds % 60);
|
||||||
|
const secsString = padLeft(`${secs}`, '0', 2);
|
||||||
|
|
||||||
|
return daysString + hoursString + minString + secsString;
|
||||||
|
}
|
||||||
|
|
||||||
|
export function padLeft(text, pad, size) {
|
||||||
|
return String(pad.repeat(size) + text).slice(-size);
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user