Creepso/stremio-web
1
0
Fork 0
mirror of https://github.com/Stremio/stremio-web.git synced 2026-04-20 14:52:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(streaming server) - use new state for warning

Browse source 
Signed-off-by: Lachezar Lechev <lachezar@ambire.com>
This commit is contained in:
Lachezar Lechev 2025-11-04 17:02:02 +02:00
parent 536be36005
commit 940af76c12
No known key found for this signature in database
GPG key ID: 69BDCB3ED8CE8037
3 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/components/NavBar/HorizontalNavBar/NavMenu/NavMenuContent.js
View file

@ -24,11 +24,12 @@ const NavMenuContent = ({ onClick }) => {
const [fullscreen, requestFullscreen, exitFullscreen] = useFullscreen();
const [isIOSPWA, isAndroidPWA] = usePWA();
const streamingServerWarningDismissed = React.useMemo(() => {
return streamingServer.settings !== null && streamingServer.settings.type === 'Ready' || (
!isNaN(profile.settings.streamingServerWarningDismissed.getTime()) &&
profile.settings.streamingServerWarningDismissed.getTime() > Date.now()
);
}, [profile.settings, streamingServer.settings]);
return streamingServer.state !== null && (streamingServer.state.type === 'Ready' && streamingServer.state.content === 'running')
|| (
!isNaN(profile.settings.streamingServerWarningDismissed.getTime()) &&
profile.settings.streamingServerWarningDismissed.getTime() > Date.now()
);
}, [profile.settings, streamingServer.state]);
const logoutButtonOnClick = React.useCallback(() => {
core.transport.dispatch({
action: 'Ctx',
@ -41,12 +42,12 @@ const NavMenuContent = ({ onClick }) => {
try {
const clipboardText = await navigator.clipboard.readText();
createTorrentFromMagnet(clipboardText);
} catch(e) {
} catch (e) {
console.error(e);
}
}, []);
return (
<div className={classnames(styles['nav-menu-container'], 'animation-fade-in', { [styles['with-warning']]: !streamingServerWarningDismissed } )} onClick={onClick}>
<div className={classnames(styles['nav-menu-container'], 'animation-fade-in', { [styles['with-warning']]: !streamingServerWarningDismissed })} onClick={onClick}>
<div className={styles['user-info-container']}>
<div
className={styles['avatar-container']}
@ -81,34 +82,34 @@ const NavMenuContent = ({ onClick }) => {
null
}
<div className={styles['nav-menu-section']}>
<Button className={styles['nav-menu-option-container']} title={ t('SETTINGS') } href={'#/settings'}>
<Button className={styles['nav-menu-option-container']} title={t('SETTINGS')} href={'#/settings'}>
<Icon className={styles['icon']} name={'settings'} />
<div className={styles['nav-menu-option-label']}>{ t('SETTINGS') }</div>
<div className={styles['nav-menu-option-label']}>{t('SETTINGS')}</div>
</Button>
<Button className={styles['nav-menu-option-container']} title={ t('ADDONS') } href={'#/addons'}>
<Button className={styles['nav-menu-option-container']} title={t('ADDONS')} href={'#/addons'}>
<Icon className={styles['icon']} name={'addons-outline'} />
<div className={styles['nav-menu-option-label']}>{ t('ADDONS') }</div>
<div className={styles['nav-menu-option-label']}>{t('ADDONS')}</div>
</Button>
<Button className={styles['nav-menu-option-container']} title={ t('PLAY_URL_MAGNET_LINK') } onClick={onPlayMagnetLinkClick}>
<Button className={styles['nav-menu-option-container']} title={t('PLAY_URL_MAGNET_LINK')} onClick={onPlayMagnetLinkClick}>
<Icon className={styles['icon']} name={'magnet-link'} />
<div className={styles['nav-menu-option-label']}>{ t('PLAY_URL_MAGNET_LINK') }</div>
<div className={styles['nav-menu-option-label']}>{t('PLAY_URL_MAGNET_LINK')}</div>
</Button>
<Button className={styles['nav-menu-option-container']} title={ t('HELP_FEEDBACK') } href={'https://stremio.zendesk.com/'} target={'_blank'}>
<Button className={styles['nav-menu-option-container']} title={t('HELP_FEEDBACK')} href={'https://stremio.zendesk.com/'} target={'_blank'}>
<Icon className={styles['icon']} name={'help'} />
<div className={styles['nav-menu-option-label']}>{ t('HELP_FEEDBACK') }</div>
<div className={styles['nav-menu-option-label']}>{t('HELP_FEEDBACK')}</div>
</Button>
</div>
<div className={styles['nav-menu-section']}>
<Button className={styles['nav-menu-option-container']} title={ t('TERMS_OF_SERVICE') } href={'https://www.stremio.com/tos'} target={'_blank'}>
<div className={styles['nav-menu-option-label']}>{ t('TERMS_OF_SERVICE') }</div>
<Button className={styles['nav-menu-option-container']} title={t('TERMS_OF_SERVICE')} href={'https://www.stremio.com/tos'} target={'_blank'}>
<div className={styles['nav-menu-option-label']}>{t('TERMS_OF_SERVICE')}</div>
</Button>
<Button className={styles['nav-menu-option-container']} title={ t('PRIVACY_POLICY') } href={'https://www.stremio.com/privacy'} target={'_blank'}>
<div className={styles['nav-menu-option-label']}>{ t('PRIVACY_POLICY') }</div>
<Button className={styles['nav-menu-option-container']} title={t('PRIVACY_POLICY')} href={'https://www.stremio.com/privacy'} target={'_blank'}>
<div className={styles['nav-menu-option-label']}>{t('PRIVACY_POLICY')}</div>
</Button>
{
profile.auth !== null ?
<Button className={styles['nav-menu-option-container']} title={ t('USER_PANEL') } href={'https://www.stremio.com/acc-settings'} target={'_blank'}>
<div className={styles['nav-menu-option-label']}>{ t('USER_PANEL') }</div>
<Button className={styles['nav-menu-option-container']} title={t('USER_PANEL')} href={'https://www.stremio.com/acc-settings'} target={'_blank'}>
<div className={styles['nav-menu-option-label']}>{t('USER_PANEL')}</div>
</Button>
:
null

4
src/routes/Board/Board.js
View file

@ -23,11 +23,11 @@ const Board = () => {
const boardCatalogsOffset = continueWatchingPreview.items.length > 0 ? 1 : 0;
const scrollContainerRef = React.useRef();
const streamingServerWarningDismissed = React.useMemo(() => {
return streamingServer.settings !== null && streamingServer.settings.type === 'Ready' || (
return streamingServer.settings !== null && (streamingServer.state.type === 'Ready' && streamingServer.state.content === 'running') || (
!isNaN(profile.settings.streamingServerWarningDismissed.getTime()) &&
profile.settings.streamingServerWarningDismissed.getTime() > Date.now()
);
}, [profile.settings, streamingServer.settings]);
}, [profile.settings, streamingServer.state]);
const onVisibleRangeChange = React.useCallback(() => {
const range = getVisibleChildrenRange(scrollContainerRef.current);
if (range === null) {

1
src/types/models/StremingServer.d.ts vendored
View file

@ -127,4 +127,5 @@ type StreamingServer = {
playbackDevices: Loadable<PlaybackDevice[]> | null,
networkInfo: Loadable<NetworkInfo> | null,
deviceInfo: Loadable<DeviceInfo> | null,
state: Loadable<string> | null
};