diff --git a/Makefile b/Makefile
index 4b467971..406a15d8 100644
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@ stage: build
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/wwwroot/
a-stage: build
- rsync -zavP --delete-before build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/a-wwwroot/
+ rsync -zavP --delete-before build/ -e 'ssh -p 666' ott-staging@10.0.3.8:/usr/local/www/ott-staging/a-wwwroot/
b-stage: build
rsync -zavP --delete-before build/ -e 'ssh -p 666' ott-staging@staging.instat.tv:/usr/local/www/ott-staging/b-wwwroot/
diff --git a/src/features/App/AuthenticatedApp.tsx b/src/features/App/AuthenticatedApp.tsx
index 500b186f..7b627bed 100644
--- a/src/features/App/AuthenticatedApp.tsx
+++ b/src/features/App/AuthenticatedApp.tsx
@@ -22,6 +22,7 @@ import { MatchPopup, MatchPopupStore } from 'features/MatchPopup'
import { BuyMatchPopup, BuyMatchPopupStore } from 'features/BuyMatchPopup'
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'
@@ -43,40 +44,43 @@ export const AuthenticatedApp = () => {
-
-
-
-
-
- { client.name === 'facr' ? : }
-
+
+
+
+
+
+
+ { client.name === 'facr' ? : }
+
- {/* в Switch как прямой children можно рендерить только Route или Redirect */}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {!isProduction && }
-
-
-
+ {/* в Switch как прямой children
+ можно рендерить только Route или Redirect */}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {!isProduction && }
+
+
+
+
diff --git a/src/features/ItemsList/styled.tsx b/src/features/ItemsList/styled.tsx
index 581c181f..752370c0 100644
--- a/src/features/ItemsList/styled.tsx
+++ b/src/features/ItemsList/styled.tsx
@@ -18,12 +18,12 @@ export const Item = styled.li`
${isMobileDevice
? css`
- @media (max-width: 650px),(orientation: landscape){
- &:not(:last-child) {
- margin-bottom: 10px;
+ @media (max-width: 650px), (orientation: landscape) {
+ &:not(:last-child) {
+ margin-bottom: 10px;
+ }
}
- }
- `
+ `
: ''};
`
@@ -42,8 +42,8 @@ export const StyledLink = styled(ProfileLink)`
}
${isMobileDevice
? css`
- height: 33px;
- `
+ height: 33px;
+ `
: ''};
`
@@ -53,6 +53,7 @@ export const ItemInfo = styled.div`
`
export const Name = styled(NameBase)`
+ margin-bottom: 5px;
display: block;
font-weight: 600;
font-size: 0.65rem;
@@ -64,37 +65,40 @@ export const Name = styled(NameBase)`
overflow: hidden;
${isMobileDevice
? css`
- font-size: 14px;
- line-height: 14px;
- margin-bottom: 2px;
- `
+ font-size: 14px;
+ line-height: 14px;
+ margin-bottom: 2px;
+ `
: ''};
`
export const Flag = styled.img`
- width: 0.567rem;
- height: 0.567rem;
- margin: 0 0.19rem;
+ width: 0.75rem;
+ height: 0.75rem;
+ margin: 0 0.19rem 0 0;
object-fit: contain;
object-position: center;
${isMobileDevice
? css`
- width: 12px;
- height: 10px;
- margin: 0 5px;
- `
+ width: 12px;
+ height: 10px;
+ margin: 0 5px 0 0;
+ `
: ''};
`
export const TeamOrCountry = styled(NameBase)`
font-weight: normal;
- font-size: 0.49rem;
+ font-size: 0.625rem;
line-height: 0.75rem;
color: rgba(255, 255, 255, 0.7);
+ :hover {
+ text-decoration: none;
+ }
${isMobileDevice
? css`
- font-size: 10px;
- line-height: 14px;
- `
+ font-size: 10px;
+ line-height: 14px;
+ `
: ''};
`
diff --git a/src/features/Menu/index.tsx b/src/features/Menu/index.tsx
index ed40518c..3cba50bb 100644
--- a/src/features/Menu/index.tsx
+++ b/src/features/Menu/index.tsx
@@ -5,7 +5,7 @@ import { client } from 'config/clients'
import { PAGES } from 'config/pages'
import { usePreferencesStore } from 'features/PreferencesPopup'
-import { useTournamentsPopup } from 'features/TournamentsPopup/hooks'
+import { useTournamentPopupStore } from 'features/TournamentsPopup/store'
import { FavoritesMobilePopup } from '../FavoritesMobilePopup'
import {
@@ -16,7 +16,7 @@ import {
export const Menu = () => {
const { openPopup } = usePreferencesStore()
- const { open } = useTournamentsPopup()
+ const { open } = useTournamentPopupStore()
const isHomePage = useRouteMatch(PAGES.home)?.isExact
return (
@@ -24,7 +24,7 @@ export const Menu = () => {
{isMobileDevice && }
{
isHomePage && !client.disabledPreferences && (
-