0

Move statusbar back to under the player

This commit is contained in:
Gabe Kangas 2022-07-12 14:10:59 -07:00
parent 9cdc3b99f2
commit 678d5c9fd6
No known key found for this signature in database
GPG Key ID: 9A56337728BC81EA
4 changed files with 14 additions and 12 deletions

View File

@ -9,7 +9,6 @@ import {
serverStatusState, serverStatusState,
} from '../../stores/ClientConfigStore'; } from '../../stores/ClientConfigStore';
import { ServerLogo } from '../../ui'; import { ServerLogo } from '../../ui';
import StatusBar from '../../ui/Statusbar';
import CategoryIcon from '../../ui/CategoryIcon/CategoryIcon'; import CategoryIcon from '../../ui/CategoryIcon/CategoryIcon';
import SocialLinks from '../../ui/SocialLinks/SocialLinks'; import SocialLinks from '../../ui/SocialLinks/SocialLinks';
import s from './StreamInfo.module.scss'; import s from './StreamInfo.module.scss';
@ -20,8 +19,7 @@ interface Props {
} }
export default function StreamInfo({ isMobile }: Props) { export default function StreamInfo({ isMobile }: Props) {
const { socialHandles, name, title, tags } = useRecoilValue<ClientConfig>(clientConfigStateAtom); const { socialHandles, name, title, tags } = useRecoilValue<ClientConfig>(clientConfigStateAtom);
const { viewerCount, lastConnectTime, lastDisconnectTime } = const { viewerCount } = useRecoilValue<ServerStatus>(serverStatusState);
useRecoilValue<ServerStatus>(serverStatusState);
const online = useRecoilValue<boolean>(isOnlineSelector); const online = useRecoilValue<boolean>(isOnlineSelector);
useEffect(() => { useEffect(() => {
@ -65,12 +63,6 @@ export default function StreamInfo({ isMobile }: Props) {
<SocialLinks links={socialHandles} /> <SocialLinks links={socialHandles} />
</div> </div>
</div> </div>
<StatusBar
online={online}
lastConnectTime={lastConnectTime}
lastDisconnectTime={lastDisconnectTime}
viewerCount={viewerCount}
/>
</div> </div>
); );
} }

View File

@ -14,6 +14,7 @@ import {
appStateAtom, appStateAtom,
isOnlineSelector, isOnlineSelector,
isMobileAtom, isMobileAtom,
serverStatusState,
} from '../../stores/ClientConfigStore'; } from '../../stores/ClientConfigStore';
import { ClientConfig } from '../../../interfaces/client-config.model'; import { ClientConfig } from '../../../interfaces/client-config.model';
import CustomPageContent from '../CustomPageContent/CustomPageContent'; import CustomPageContent from '../CustomPageContent/CustomPageContent';
@ -35,6 +36,8 @@ import NotifyButton from '../../action-buttons/NotifyButton';
import Modal from '../Modal/Modal'; import Modal from '../Modal/Modal';
import BrowserNotifyModal from '../../modals/BrowserNotify/BrowserNotifyModal'; import BrowserNotifyModal from '../../modals/BrowserNotify/BrowserNotifyModal';
import StreamInfo from '../../common/StreamInfo'; import StreamInfo from '../../common/StreamInfo';
import { ServerStatus } from '../../../interfaces/server-status.model';
import { StatusBar } from '..';
const { TabPane } = Tabs; const { TabPane } = Tabs;
const { Content } = Layout; const { Content } = Layout;
@ -48,7 +51,8 @@ export default function ContentComponent() {
const online = useRecoilValue<boolean>(isOnlineSelector); const online = useRecoilValue<boolean>(isOnlineSelector);
const chatDisplayName = useRecoilValue<string>(chatDisplayNameAtom); const chatDisplayName = useRecoilValue<string>(chatDisplayNameAtom);
const chatUserId = useRecoilValue<string>(chatUserIdAtom); const chatUserId = useRecoilValue<string>(chatUserIdAtom);
const { viewerCount, lastConnectTime, lastDisconnectTime } =
useRecoilValue<ServerStatus>(serverStatusState);
const { extraPageContent, version, name, summary } = clientConfig; const { extraPageContent, version, name, summary } = clientConfig;
const [showNotifyReminder, setShowNotifyReminder] = useState(false); const [showNotifyReminder, setShowNotifyReminder] = useState(false);
const [showNotifyPopup, setShowNotifyPopup] = useState(false); const [showNotifyPopup, setShowNotifyPopup] = useState(false);
@ -120,6 +124,12 @@ export default function ContentComponent() {
text="Stream is offline text goes here. Will create a new form to set it in the Admin." text="Stream is offline text goes here. Will create a new form to set it in the Admin."
/> />
)} )}
<StatusBar
online={online}
lastConnectTime={lastConnectTime}
lastDisconnectTime={lastDisconnectTime}
viewerCount={viewerCount}
/>
<div className={s.buttonsLogoTitleSection}> <div className={s.buttonsLogoTitleSection}>
<ActionButtonRow> <ActionButtonRow>
{externalActionButtons} {externalActionButtons}

View File

@ -1,6 +1,6 @@
// Do not edit directly // Do not edit directly
// Generated on Tue, 12 Jul 2022 20:15:16 GMT // Generated on Tue, 12 Jul 2022 21:03:36 GMT
// //
// How to edit these values: // How to edit these values:
// Edit the corresponding token file under the style-definitions directory // Edit the corresponding token file under the style-definitions directory

View File

@ -1,6 +1,6 @@
/** /**
* Do not edit directly * Do not edit directly
* Generated on Tue, 12 Jul 2022 20:15:16 GMT * Generated on Tue, 12 Jul 2022 21:03:36 GMT
* *
* How to edit these values: * How to edit these values:
* Edit the corresponding token file under the style-definitions directory * Edit the corresponding token file under the style-definitions directory