Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions node_modules/.package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 16 additions & 10 deletions node_modules/.vite/deps/_metadata.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
Expand Up @@ -124,3 +124,18 @@ body {
padding: 0.5rem;
margin-bottom: 0.5rem;
}

.favorite-button {
color: orange;
background-color: #15151e;
padding: 0.5rem 1rem;
border-radius: 0.375rem;
cursor: pointer;
border: none;
font-size: 1.7rem;
}
.favorite-button:hover {
color: white;
}


29 changes: 27 additions & 2 deletions src/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,25 @@ const sessionDate = new Intl.DateTimeFormat("en-GB", {
type SortOrder = "none" | "asc" | "desc";

function App() {
const [favorites, setFavorites] = useState<number[]>(() =>
JSON.parse(localStorage.getItem("favorites") ?? "[]"),
);
const [showFavorites, setShowFavorites] = useState(false);

useEffect(() => {
localStorage.setItem("favorites", JSON.stringify(favorites));
}, [favorites]);

function toggleFavorite(driverNumber: number) {
setFavorites((current) => {
if (current.includes(driverNumber)) {
return current.filter((number) => number !== driverNumber);
}

return [...current, driverNumber];
});
}

const [search, setSearch] = useState(
() => sessionStorage.getItem("search") ?? "",
);
Expand Down Expand Up @@ -101,7 +120,9 @@ function App() {
.toLowerCase()
.includes(search.toLowerCase());
const matchesTeam = team === "all" || driver.team_name === team;
return matchesSearch && matchesTeam;
const matchesFavorites =
!showFavorites || favorites.includes(driver.driver_number);
return matchesSearch && matchesTeam && matchesFavorites;
})
.sort((a, b) => {
if (sortOrder === "asc") {
Expand Down Expand Up @@ -145,6 +166,8 @@ function App() {
return (
<>
<SearchAndFilter
showFavorites={showFavorites}
onShowFavoritesChange={setShowFavorites}
search={search}
onSearchChange={setSearch}
team={team}
Expand All @@ -162,10 +185,12 @@ function App() {
: driversWithStandingsError
? "Could not load drivers."
: filteredDrivers.length === 0
? "No drivers match your search and team filter."
? "No drivers match your filters."
: filteredDrivers.map((driver) => (
<DriverCard
key={driver.driver_number}
isFavorite={favorites.includes(driver.driver_number)}
onToggleFavorite={() => toggleFavorite(driver.driver_number)}
teamStanding={teamStandings.find(
(team) => team.team_name === driver.team_name,
)}
Expand Down
24 changes: 21 additions & 3 deletions src/components/DriverCard.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,30 @@ interface DriverCardProps {
teamStanding?: TeamStandings;
teamStandingsPending: boolean;
teamStandingsError: boolean;
isFavorite: boolean;
onToggleFavorite: () => void;
}

export default function DriverCard({ driver, teamStanding, teamStandingsPending, teamStandingsError }: DriverCardProps) {
export default function DriverCard({
driver,
teamStanding,
teamStandingsPending,
teamStandingsError,
isFavorite,
onToggleFavorite,
}: DriverCardProps) {

return (
<div className="driver-card" style={{ border: `2px solid #${driver.team_colour}` }}>
<button
className="favorite-button"
type="button"
onClick={onToggleFavorite}
aria-label={`Favorite ${driver.name}`}
aria-pressed={isFavorite}
>
{isFavorite ? "★" : "☆"}
</button>
<h1 style={{ color: `#${driver.team_colour}` }}>{driver.number}</h1>
<h2>{driver.name}</h2>
<img style={{ backgroundColor: `#${driver.team_colour}` }} src={driver.headshot_url ? driver.headshot_url : 'https://placehold.net/avatar.svg'} alt={driver.name} />
Expand All @@ -31,8 +49,8 @@ export default function DriverCard({ driver, teamStanding, teamStandingsPending,
Team points: {teamStandingsPending
? 'Loading...'
: teamStandingsError
? 'Could not load points'
: teamStanding?.points_current ?? 'Unavailable'}
? 'Could not load points'
: teamStanding?.points_current ?? 'Unavailable'}
</p>
</div>
)
Expand Down
12 changes: 12 additions & 0 deletions src/components/SearchAndFilter.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
interface SearchAndFilterProps {
showFavorites: boolean;
onShowFavoritesChange: (value: boolean) => void;
search: string;
onSearchChange: (value: string) => void;
team: string;
Expand All @@ -9,6 +11,8 @@ interface SearchAndFilterProps {
}

function SearchAndFilter({
showFavorites,
onShowFavoritesChange,
search,
onSearchChange,
team,
Expand Down Expand Up @@ -43,6 +47,14 @@ function SearchAndFilter({
<option value="desc">Position: High to Low</option>
<option value="asc">Position: Low to High</option>
</select>

<button
type="button"
onClick={() => onShowFavoritesChange(!showFavorites)}
aria-pressed={showFavorites}
>
Favorites
</button>
</div>
);
}
Expand Down