develop #280

Merged
andrey.dekterev merged 2 commits from develop into master 2 years ago
  1. 16
      src/features/App/AuthenticatedApp.tsx
  2. 23
      src/features/Menu/index.tsx
  3. 6
      src/features/StreamPlayer/index.tsx
  4. 1
      src/requests/getMatchInfo.tsx

@ -10,7 +10,7 @@ import { RecoilRoot } from 'recoil'
import { indexLexics } from 'config/lexics/indexLexics'
import {
client,
// client,
PAGES,
isProduction,
isMobileDevice,
@ -23,8 +23,11 @@ import { MatchSwitchesStore } from 'features/MatchSwitches'
import { UserFavoritesStore } from 'features/UserFavorites/store'
import { MatchPopup, MatchPopupStore } from 'features/MatchPopup'
import { BuyMatchPopupStore } from 'features/BuyMatchPopup'
import { PreferencesPopup, PreferencesPopupStore } from 'features/PreferencesPopup'
import { TournamentsPopup } from 'features/TournamentsPopup'
import {
// PreferencesPopup,
PreferencesPopupStore,
} from 'features/PreferencesPopup'
// import { TournamentsPopup } from 'features/TournamentsPopup'
import { TournamentPopupStore } from 'features/TournamentsPopup/store'
import { CardsStore } from 'features/CardsStore'
import { NoNetworkPopup, NoNetworkPopupStore } from 'features/NoNetworkPopup'
@ -63,7 +66,12 @@ export const AuthenticatedApp = () => {
<BuyMatchPopupStore>
<NoNetworkPopupStore>
<MatchPopup />
{ client.name === 'facr' ? <TournamentsPopup /> : <PreferencesPopup /> }
{/* временно отключено по задаче IN-730 */}
{/* {
client.name === 'facr'
? <TournamentsPopup />
: <PreferencesPopup />
} */}
<NoNetworkPopup />
{/* в Switch как прямой children
можно рендерить только Route или Redirect */}

@ -1,11 +1,16 @@
import { Link, useRouteMatch } from 'react-router-dom'
// кнопка настроек в хедере facr
// временно отключена по задаче IN-730
import {
Link,
// useRouteMatch
} from 'react-router-dom'
import { isMobileDevice } from 'config/userAgent'
import { client } from 'config/clients'
// import { client } from 'config/clients'
import { PAGES } from 'config/pages'
import { usePreferencesStore } from 'features/PreferencesPopup'
import { useTournamentPopupStore } from 'features/TournamentsPopup/store'
// import { usePreferencesStore } from 'features/PreferencesPopup'
// import { useTournamentPopupStore } from 'features/TournamentsPopup/store'
import { useAuthStore } from 'features/AuthStore'
import { FavoritesMobilePopup } from '../FavoritesMobilePopup'
@ -17,21 +22,21 @@ import {
} from './styled'
export const Menu = () => {
const { openPopup } = usePreferencesStore()
const { open } = useTournamentPopupStore()
const isHomePage = useRouteMatch(PAGES.home)?.isExact
// const { openPopup } = usePreferencesStore()
// const { open } = useTournamentPopupStore()
// const isHomePage = useRouteMatch(PAGES.home)?.isExact
const { logout, user } = useAuthStore()
return (
<MenuList>
{isMobileDevice && <FavoritesMobilePopup />}
{
{/* {
isHomePage && !client.disabledPreferences && (
<MenuItem onClick={client.name === 'facr' ? open : openPopup}>
<Icon src='header-settings' size='1.4rem' />
</MenuItem>
)
}
} */}
<MenuItem onClick={(e) => {
e.preventDefault()
!user && logout('saveToken')

@ -42,6 +42,8 @@ import {
const tournamentsWithWatermark = {
316: 'Tunisia',
1136: 'Brasil',
1448: 'India',
5950: 'India',
}
/**
* HLS плеер, применяется на лайв и завершенных матчах
@ -163,9 +165,9 @@ export const StreamPlayer = (props: Props) => {
<Loader color='#515151' />
</LoaderWrapper>
{user
&& Boolean(
&& (Boolean(
tournamentsWithWatermark[profile?.tournament.id as keyof typeof tournamentsWithWatermark],
)
) || profile?.watermark)
&& playing
&& isLive
&& (

@ -68,6 +68,7 @@ export type MatchInfo = {
team2: Team,
tournament: MatchTournament,
video_bounds?: VideoBounds,
watermark?: boolean,
youtube_link?: string,
} | null

Loading…
Cancel
Save