diff --git a/src/features/HomePage/components/HeaderFilters/styled.tsx b/src/features/HomePage/components/HeaderFilters/styled.tsx index 7c269e71..f7566c21 100644 --- a/src/features/HomePage/components/HeaderFilters/styled.tsx +++ b/src/features/HomePage/components/HeaderFilters/styled.tsx @@ -6,6 +6,7 @@ export const ScHeaderFilters = styled.div` display: flex; flex-direction: row; margin-bottom: 23px; + align-items: center; .activeLive { color: #ffffff; diff --git a/src/features/MatchPage/components/FavouriteTeam/hooks.tsx b/src/features/MatchPage/components/FavouriteTeam/hooks.tsx index 89d70810..b65e2688 100644 --- a/src/features/MatchPage/components/FavouriteTeam/hooks.tsx +++ b/src/features/MatchPage/components/FavouriteTeam/hooks.tsx @@ -7,105 +7,56 @@ import { } from 'requests/getFavouriteTeam' import { saveFavouriteTeam } from 'requests/saveFavouriteTeam' -/* eslint-disable */ -const groupTeams = { - 1086: 'group_1', - 7032: 'group_1', - 6132: 'group_1', - 7321: 'group_1', - 62: 'group_1', - 7329: 'group_1', - 17958: 'group_1', - 1076: 'group_1', - 6337: 'group_1', - 9114: 'group_1', - 9143: 'group_1', - 7011: 'group_1', - 6996: 'group_1', - 3945: 'group_1', - 6330: 'group_1', - 7346: 'group_1', - 6331: 'group_1', - 31608: 'group_1', - 6335: 'group_1', - 6332: 'group_1', - 9108: 'group_1', - 1089: 'group_2', - 7102: 'group_2', - 7018: 'group_2', - 6549: 'group_2', - 3965: 'group_2', - 2103: 'group_2', - 167340: 'group_2', - 6606: 'group_2', - 7016: 'group_2', - 7015: 'group_2', - 7288: 'group_2', - 1093: 'group_2', - 1092: 'group_2', - 1085: 'group_2', - 3882: 'group_2', - 7307: 'group_2', - 7306: 'group_2', - 7108: 'group_2', - 1088: 'group_2', - 1077: 'group_2', -} - export const useFavouriteTeam = () => { - const [teams, setTeams] = useState>([]) const [activeId, setActiveId] = useState(null) const [isOpen, setIsOpen] = useState(false) const [group1, setGroup1] = useState>([]) const [group2, setGroup2] = useState>([]) + const sortTeam = (teams: Array) => teams.sort((n1:FavouriteTeams, n2: FavouriteTeams) => { + if (n1.name_en > n2.name_en) { + return 1 + } if (n1.name_en < n2.name_en) { + return -1 + } + return 0 + }) const changeActive = (team: FavouriteTeams) => { setActiveId((prev) => (prev === team.id ? null : team.id)) } const onSaveFavouriteTeam = () => { activeId && saveFavouriteTeam( - { - answer_id: activeId, - survey_id: 1, - }) + { + answer_id: activeId, + survey_id: 1, + }, + ) setIsOpen(false) } - - useEffect( () => { + useEffect(() => { (async () => { - const { data, status }: ResponseType = await getFavouriteTeam({ + const { data: teams1, status }: ResponseType = await getFavouriteTeam({ country_id: 77, season: 30, sport_id: 1, tournament_id: 131, }) - if(!status) { - setTeams(data.sort((n1:FavouriteTeams , n2: FavouriteTeams) => { - if (n1.name_en > n2.name_en) { - return 1; - } else if (n1.name_en < n2.name_en) { - return -1; - } - return 0; - })) + const { data: teams2 }: ResponseType = await getFavouriteTeam({ + country_id: 77, + season: 30, + sport_id: 1, + tournament_id: 2032, + }) + if (!status) { + setGroup1(sortTeam(teams1)) + setGroup2(sortTeam(teams2)) setIsOpen(true) - }else{ - return } })() }, []) - useEffect(() => { - setGroup1(teams?.filter( - (team: FavouriteTeams) => groupTeams[team.id as keyof typeof groupTeams] === 'group_1', - )) - setGroup2(teams?.filter( - (team: FavouriteTeams) => groupTeams[team.id as keyof typeof groupTeams] === 'group_2', - )) - }, [teams]) - return { activeId, changeActive, diff --git a/src/features/MatchPage/index.tsx b/src/features/MatchPage/index.tsx index a98836c5..a0f4fb64 100644 --- a/src/features/MatchPage/index.tsx +++ b/src/features/MatchPage/index.tsx @@ -81,7 +81,10 @@ const MatchPageComponent = () => { - {profile?.tournament.id === 131 && } + { + (profile?.tournament.id === 131 || profile?.tournament.id === 2032) + && + } ) } diff --git a/src/features/TournamentPage/index.tsx b/src/features/TournamentPage/index.tsx index 83178e34..9a0d9655 100644 --- a/src/features/TournamentPage/index.tsx +++ b/src/features/TournamentPage/index.tsx @@ -37,7 +37,7 @@ const TournamentPage = () => { - {tournamentId === 131 && } + {(tournamentId === 131 || tournamentId === 2032) && } ) }