diff --git a/frontend-react/src/components/tournaments/TournamentCard.tsx b/frontend-react/src/components/tournaments/TournamentCard.tsx index cfbfe25aa..f5f34e567 100644 --- a/frontend-react/src/components/tournaments/TournamentCard.tsx +++ b/frontend-react/src/components/tournaments/TournamentCard.tsx @@ -5,6 +5,7 @@ import { months } from "../../utils/lists" import trophy from "../../assets/trophy.png" import WeaponImage from "../common/WeaponImage" import { Weapon } from "../../types" +import Flag from "../common/Flag" interface TournamentCardProps { tournament: { @@ -25,9 +26,7 @@ const TournamentCard: React.FC = ({ tournament, styledOnHover, }) => { - const { grayWithShade, themeColorWithShade, darkerBgColor } = useContext( - MyThemeContext - ) + const { grayWithShade } = useContext(MyThemeContext) const a = new Date(parseInt(tournament.date)) const dateStr = `${a.getDate()} ${ months[a.getMonth() + 1] @@ -43,7 +42,8 @@ const TournamentCard: React.FC = ({ h="100%" flexDirection="column" justifyContent="space-between" - _hover={styledOnHover ? { bg: darkerBgColor } : undefined} + transition="all 0.2s" + _hover={styledOnHover ? { transform: "translateY(-3px)" } : undefined} > {tournament.name} @@ -55,7 +55,7 @@ const TournamentCard: React.FC = ({ fontSize="xs" mt="0.5em" > - {dateStr} + {dateStr} {tournament.jpn && } = ({ id }) => { - const { themeColorWithShade, grayWithShade } = useContext(MyThemeContext) + const { themeColorWithShade, grayWithShade, textColor } = useContext( + MyThemeContext + ) const { data, error, loading } = useQuery< SearchForTournamentByIdData, SearchForTournamentByIdVars @@ -40,7 +42,6 @@ const TournamentDetailsPage: React.FC const tournament = data.searchForTournamentById - console.log({ tournament }) const abilityMap = (ability: Ability, index: number) => { const gridArea = `3 / ${1 + index} / 4 / ${2 + index}` @@ -117,7 +118,7 @@ const TournamentDetailsPage: React.FC VICTORY - + {round.winning_team_name} @@ -159,7 +160,7 @@ const TournamentDetailsPage: React.FC DEFEAT - + {round.losing_team_name} diff --git a/frontend-react/src/components/tournaments/TournamentFilters.tsx b/frontend-react/src/components/tournaments/TournamentFilters.tsx new file mode 100644 index 000000000..66db6c507 --- /dev/null +++ b/frontend-react/src/components/tournaments/TournamentFilters.tsx @@ -0,0 +1,23 @@ +import React, { useState } from "react" +import Button from "../elements/Button" +import { Collapse } from "@chakra-ui/core" + +interface TournamentFiltersProps {} + +const TournamentFilters: React.FC = ({}) => { + const [show, setShow] = useState(true) + return ( + <> + + + Anim pariatur cliche reprehenderit, enim eiusmod high life accusamus + terry richardson ad squid. Nihil anim keffiyeh helvetica, craft beer + labore wes anderson cred nesciunt sapiente ea proident. + + + ) +} + +export default TournamentFilters diff --git a/frontend-react/src/components/tournaments/TournamentsPage.tsx b/frontend-react/src/components/tournaments/TournamentsPage.tsx index d76bf218b..25aaba0ff 100644 --- a/frontend-react/src/components/tournaments/TournamentsPage.tsx +++ b/frontend-react/src/components/tournaments/TournamentsPage.tsx @@ -14,6 +14,7 @@ import Loading from "../common/Loading" import Error from "../common/Error" import TournamentCard from "./TournamentCard" import { Box, Grid } from "@chakra-ui/core" +import TournamentFilters from "./TournamentFilters" interface SearchForTournamentsData { searchForTournaments: { @@ -77,12 +78,14 @@ const TournamentsPage: React.FC = ({}) => { Tournaments | sendou.ink + {tournaments.map(tournament => ( - +