fix(#in730): facr header settings popup temp disable

pull/278/head
Farber Denis 2 years ago
parent f70fe23926
commit 02c72a87f1
  1. 16
      src/features/App/AuthenticatedApp.tsx
  2. 23
      src/features/Menu/index.tsx

@ -10,7 +10,7 @@ import { RecoilRoot } from 'recoil'
import { indexLexics } from 'config/lexics/indexLexics' import { indexLexics } from 'config/lexics/indexLexics'
import { import {
client, // client,
PAGES, PAGES,
isProduction, isProduction,
isMobileDevice, isMobileDevice,
@ -23,8 +23,11 @@ import { MatchSwitchesStore } from 'features/MatchSwitches'
import { UserFavoritesStore } from 'features/UserFavorites/store' import { UserFavoritesStore } from 'features/UserFavorites/store'
import { MatchPopup, MatchPopupStore } from 'features/MatchPopup' import { MatchPopup, MatchPopupStore } from 'features/MatchPopup'
import { BuyMatchPopupStore } from 'features/BuyMatchPopup' import { BuyMatchPopupStore } from 'features/BuyMatchPopup'
import { PreferencesPopup, PreferencesPopupStore } from 'features/PreferencesPopup' import {
import { TournamentsPopup } from 'features/TournamentsPopup' // PreferencesPopup,
PreferencesPopupStore,
} from 'features/PreferencesPopup'
// import { TournamentsPopup } from 'features/TournamentsPopup'
import { TournamentPopupStore } from 'features/TournamentsPopup/store' import { TournamentPopupStore } from 'features/TournamentsPopup/store'
import { CardsStore } from 'features/CardsStore' import { CardsStore } from 'features/CardsStore'
import { NoNetworkPopup, NoNetworkPopupStore } from 'features/NoNetworkPopup' import { NoNetworkPopup, NoNetworkPopupStore } from 'features/NoNetworkPopup'
@ -63,7 +66,12 @@ export const AuthenticatedApp = () => {
<BuyMatchPopupStore> <BuyMatchPopupStore>
<NoNetworkPopupStore> <NoNetworkPopupStore>
<MatchPopup /> <MatchPopup />
{ client.name === 'facr' ? <TournamentsPopup /> : <PreferencesPopup /> } {/* временно отключено по задаче IN-730 */}
{/* {
client.name === 'facr'
? <TournamentsPopup />
: <PreferencesPopup />
} */}
<NoNetworkPopup /> <NoNetworkPopup />
{/* в Switch как прямой children {/* в Switch как прямой children
можно рендерить только Route или Redirect */} можно рендерить только 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 { isMobileDevice } from 'config/userAgent'
import { client } from 'config/clients' // import { client } from 'config/clients'
import { PAGES } from 'config/pages' import { PAGES } from 'config/pages'
import { usePreferencesStore } from 'features/PreferencesPopup' // import { usePreferencesStore } from 'features/PreferencesPopup'
import { useTournamentPopupStore } from 'features/TournamentsPopup/store' // import { useTournamentPopupStore } from 'features/TournamentsPopup/store'
import { useAuthStore } from 'features/AuthStore' import { useAuthStore } from 'features/AuthStore'
import { FavoritesMobilePopup } from '../FavoritesMobilePopup' import { FavoritesMobilePopup } from '../FavoritesMobilePopup'
@ -17,21 +22,21 @@ import {
} from './styled' } from './styled'
export const Menu = () => { export const Menu = () => {
const { openPopup } = usePreferencesStore() // const { openPopup } = usePreferencesStore()
const { open } = useTournamentPopupStore() // const { open } = useTournamentPopupStore()
const isHomePage = useRouteMatch(PAGES.home)?.isExact // const isHomePage = useRouteMatch(PAGES.home)?.isExact
const { logout, user } = useAuthStore() const { logout, user } = useAuthStore()
return ( return (
<MenuList> <MenuList>
{isMobileDevice && <FavoritesMobilePopup />} {isMobileDevice && <FavoritesMobilePopup />}
{ {/* {
isHomePage && !client.disabledPreferences && ( isHomePage && !client.disabledPreferences && (
<MenuItem onClick={client.name === 'facr' ? open : openPopup}> <MenuItem onClick={client.name === 'facr' ? open : openPopup}>
<Icon src='header-settings' size='1.4rem' /> <Icon src='header-settings' size='1.4rem' />
</MenuItem> </MenuItem>
) )
} } */}
<MenuItem onClick={(e) => { <MenuItem onClick={(e) => {
e.preventDefault() e.preventDefault()
!user && logout('saveToken') !user && logout('saveToken')

Loading…
Cancel
Save