Compare commits
3 Commits
624bd36f78
...
3dd07cb6a6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3dd07cb6a6 | ||
| d560b6db6f | |||
| 500be84f39 |
18
frontend/pnpm-lock.yaml
generated
18
frontend/pnpm-lock.yaml
generated
@ -22,7 +22,7 @@ importers:
|
|||||||
version: 19.2.1(react@19.2.1)
|
version: 19.2.1(react@19.2.1)
|
||||||
react-router-dom:
|
react-router-dom:
|
||||||
specifier: ^7.10.1
|
specifier: ^7.10.1
|
||||||
version: 7.10.1(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
|
version: 7.12.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
|
||||||
devDependencies:
|
devDependencies:
|
||||||
'@eslint/js':
|
'@eslint/js':
|
||||||
specifier: ^9.39.1
|
specifier: ^9.39.1
|
||||||
@ -425,7 +425,7 @@ packages:
|
|||||||
resolution: {integrity: sha512-EcA07pHJouywpzsoTUqNh5NwGayl2PPVEJKUSinGGSxFGYn+shYbqMGBg6FXDqgXum9Ou/ecb+411ssw8HImJQ==}
|
resolution: {integrity: sha512-EcA07pHJouywpzsoTUqNh5NwGayl2PPVEJKUSinGGSxFGYn+shYbqMGBg6FXDqgXum9Ou/ecb+411ssw8HImJQ==}
|
||||||
engines: {node: ^20.19.0 || >=22.12.0}
|
engines: {node: ^20.19.0 || >=22.12.0}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
vite: ^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
|
vite: npm:rolldown-vite@7.2.5
|
||||||
|
|
||||||
acorn-jsx@5.3.2:
|
acorn-jsx@5.3.2:
|
||||||
resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
|
resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
|
||||||
@ -872,15 +872,15 @@ packages:
|
|||||||
resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==}
|
resolution: {integrity: sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==}
|
||||||
engines: {node: '>=0.10.0'}
|
engines: {node: '>=0.10.0'}
|
||||||
|
|
||||||
react-router-dom@7.10.1:
|
react-router-dom@7.12.0:
|
||||||
resolution: {integrity: sha512-JNBANI6ChGVjA5bwsUIwJk7LHKmqB4JYnYfzFwyp2t12Izva11elds2jx7Yfoup2zssedntwU0oZ5DEmk5Sdaw==}
|
resolution: {integrity: sha512-pfO9fiBcpEfX4Tx+iTYKDtPbrSLLCbwJ5EqP+SPYQu1VYCXdy79GSj0wttR0U4cikVdlImZuEZ/9ZNCgoaxwBA==}
|
||||||
engines: {node: '>=20.0.0'}
|
engines: {node: '>=20.0.0'}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
react: '>=18'
|
react: '>=18'
|
||||||
react-dom: '>=18'
|
react-dom: '>=18'
|
||||||
|
|
||||||
react-router@7.10.1:
|
react-router@7.12.0:
|
||||||
resolution: {integrity: sha512-gHL89dRa3kwlUYtRQ+m8NmxGI6CgqN+k4XyGjwcFoQwwCWF6xXpOCUlDovkXClS0d0XJN/5q7kc5W3kiFEd0Yw==}
|
resolution: {integrity: sha512-kTPDYPFzDVGIIGNLS5VJykK0HfHLY5MF3b+xj0/tTyNYL1gF1qs7u67Z9jEhQk2sQ98SUaHxlG31g1JtF7IfVw==}
|
||||||
engines: {node: '>=20.0.0'}
|
engines: {node: '>=20.0.0'}
|
||||||
peerDependencies:
|
peerDependencies:
|
||||||
react: '>=18'
|
react: '>=18'
|
||||||
@ -1852,13 +1852,13 @@ snapshots:
|
|||||||
|
|
||||||
react-refresh@0.18.0: {}
|
react-refresh@0.18.0: {}
|
||||||
|
|
||||||
react-router-dom@7.10.1(react-dom@19.2.1(react@19.2.1))(react@19.2.1):
|
react-router-dom@7.12.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1):
|
||||||
dependencies:
|
dependencies:
|
||||||
react: 19.2.1
|
react: 19.2.1
|
||||||
react-dom: 19.2.1(react@19.2.1)
|
react-dom: 19.2.1(react@19.2.1)
|
||||||
react-router: 7.10.1(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
|
react-router: 7.12.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1)
|
||||||
|
|
||||||
react-router@7.10.1(react-dom@19.2.1(react@19.2.1))(react@19.2.1):
|
react-router@7.12.0(react-dom@19.2.1(react@19.2.1))(react@19.2.1):
|
||||||
dependencies:
|
dependencies:
|
||||||
cookie: 1.1.1
|
cookie: 1.1.1
|
||||||
react: 19.2.1
|
react: 19.2.1
|
||||||
|
|||||||
@ -333,7 +333,7 @@ export function EditGame({ onShowToast }: Props) {
|
|||||||
<input
|
<input
|
||||||
type="number"
|
type="number"
|
||||||
value={price}
|
value={price}
|
||||||
onChange={(e) => setPrice(Number(e.target.value))}
|
onChange={(e) => setPrice(Number(e.target.value.replace(',', '.')))}
|
||||||
min="0"
|
min="0"
|
||||||
step="0.01"
|
step="0.01"
|
||||||
style={inputStyles}
|
style={inputStyles}
|
||||||
|
|||||||
@ -11,4 +11,82 @@
|
|||||||
|
|
||||||
.gamefilter-entry:hover {
|
.gamefilter-entry:hover {
|
||||||
background-color: var(--primary-bg);
|
background-color: var(--primary-bg);
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-controls {
|
||||||
|
background-color: var(--secondary-alt-bg);
|
||||||
|
border-radius: 8px;
|
||||||
|
padding: 1.5rem;
|
||||||
|
margin-bottom: 2rem;
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-controls h3 {
|
||||||
|
margin: 0 0 1rem 0;
|
||||||
|
font-size: 1.1rem;
|
||||||
|
color: var(--text-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-groups {
|
||||||
|
display: flex;
|
||||||
|
flex-wrap: wrap;
|
||||||
|
gap: 1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-group {
|
||||||
|
display: flex;
|
||||||
|
flex-direction: column;
|
||||||
|
gap: 0.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.filter-group label {
|
||||||
|
font-size: 0.9rem;
|
||||||
|
color: var(--text-color);
|
||||||
|
font-weight: 500;
|
||||||
|
}
|
||||||
|
|
||||||
|
.checkbox-wrapper {
|
||||||
|
display: flex;
|
||||||
|
align-items: center;
|
||||||
|
gap: 0.5rem;
|
||||||
|
cursor: pointer;
|
||||||
|
}
|
||||||
|
|
||||||
|
.checkbox-wrapper input[type="checkbox"] {
|
||||||
|
width: 18px;
|
||||||
|
height: 18px;
|
||||||
|
cursor: pointer;
|
||||||
|
accent-color: var(--accent-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.checkbox-wrapper span {
|
||||||
|
font-size: 0.9rem;
|
||||||
|
color: var(--text-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.price-input {
|
||||||
|
padding: 0.5rem;
|
||||||
|
border: 1px solid var(--border-color);
|
||||||
|
border-radius: 4px;
|
||||||
|
background-color: var(--primary-bg);
|
||||||
|
color: var(--text-color);
|
||||||
|
width: 120px;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.price-input:focus {
|
||||||
|
outline: none;
|
||||||
|
border-color: var(--accent-color);
|
||||||
|
}
|
||||||
|
|
||||||
|
.tooltip-icon {
|
||||||
|
display: inline-block;
|
||||||
|
margin-left: 0.3rem;
|
||||||
|
cursor: help;
|
||||||
|
font-size: 0.9rem;
|
||||||
|
opacity: 0.6;
|
||||||
|
}
|
||||||
|
|
||||||
|
.tooltip-icon:hover {
|
||||||
|
opacity: 1;
|
||||||
}
|
}
|
||||||
@ -11,10 +11,16 @@ export function GameFilter() {
|
|||||||
const [people, setPeople] = useState<Person[]>([]);
|
const [people, setPeople] = useState<Person[]>([]);
|
||||||
const [loading, setLoading] = useState(true);
|
const [loading, setLoading] = useState(true);
|
||||||
const [selectedPeople, setSelectedPeople] = useState<Set<string>>(new Set());
|
const [selectedPeople, setSelectedPeople] = useState<Set<string>>(new Set());
|
||||||
|
const [freeGamesOnly, setFreeGamesOnly] = useState(false);
|
||||||
|
const [maxPrice, setMaxPrice] = useState<number | null>(null);
|
||||||
|
const [ownershipMode, setOwnershipMode] = useState(false);
|
||||||
|
|
||||||
const { filteredGames, gameToPositive } = useGameFilter(
|
const { filteredGames, gameToPositive, games } = useGameFilter(
|
||||||
people,
|
people,
|
||||||
selectedPeople
|
selectedPeople,
|
||||||
|
freeGamesOnly,
|
||||||
|
maxPrice,
|
||||||
|
ownershipMode
|
||||||
);
|
);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
@ -57,10 +63,62 @@ export function GameFilter() {
|
|||||||
onTogglePerson={togglePerson}
|
onTogglePerson={togglePerson}
|
||||||
/>
|
/>
|
||||||
|
|
||||||
|
<div className="filter-controls">
|
||||||
|
<h3>Additional Filters</h3>
|
||||||
|
<div className="filter-groups">
|
||||||
|
<div className="filter-group">
|
||||||
|
<label className="checkbox-wrapper">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={freeGamesOnly}
|
||||||
|
onChange={(e) => setFreeGamesOnly(e.target.checked)}
|
||||||
|
/>
|
||||||
|
<span>Free games only</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="filter-group">
|
||||||
|
<label htmlFor="max-price">Maximum price ($)</label>
|
||||||
|
<input
|
||||||
|
id="max-price"
|
||||||
|
type="number"
|
||||||
|
className="price-input"
|
||||||
|
min="0"
|
||||||
|
placeholder="No limit"
|
||||||
|
value={maxPrice ?? ""}
|
||||||
|
onChange={(e) => {
|
||||||
|
const value = e.target.value;
|
||||||
|
setMaxPrice(value === "" ? null : parseInt(value, 10));
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div className="filter-group">
|
||||||
|
<label className="checkbox-wrapper">
|
||||||
|
<input
|
||||||
|
type="checkbox"
|
||||||
|
checked={ownershipMode}
|
||||||
|
onChange={(e) => setOwnershipMode(e.target.checked)}
|
||||||
|
/>
|
||||||
|
<span>
|
||||||
|
Ownership mode
|
||||||
|
<span
|
||||||
|
className="tooltip-icon"
|
||||||
|
title="For paid games, only show if ALL selected people have marked it as wouldPlay"
|
||||||
|
>
|
||||||
|
?
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<FilteredGamesList
|
<FilteredGamesList
|
||||||
filteredGames={filteredGames}
|
filteredGames={filteredGames}
|
||||||
gameToPositive={gameToPositive}
|
gameToPositive={gameToPositive}
|
||||||
selectedPeopleCount={selectedPeople.size}
|
selectedPeopleCount={selectedPeople.size}
|
||||||
|
games={games}
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
);
|
);
|
||||||
|
|||||||
@ -463,7 +463,7 @@ export function GameList({ onShowToast }: Props) {
|
|||||||
<input
|
<input
|
||||||
type="number"
|
type="number"
|
||||||
value={price}
|
value={price}
|
||||||
onChange={(e) => setPrice(Number(e.target.value))}
|
onChange={(e) => setPrice(Number(e.target.value.replace(',', '.')))}
|
||||||
min="0"
|
min="0"
|
||||||
step="0.01"
|
step="0.01"
|
||||||
style={inputStyles}
|
style={inputStyles}
|
||||||
|
|||||||
@ -1,17 +1,20 @@
|
|||||||
import { Link } from "react-router-dom";
|
import { Link } from "react-router-dom";
|
||||||
import { GameImage } from "../GameImage";
|
import { GameImage } from "../GameImage";
|
||||||
import { EmptyState } from "./EmptyState";
|
import { EmptyState } from "./EmptyState";
|
||||||
|
import { Game as GameProto } from "../../items";
|
||||||
|
|
||||||
interface FilteredGamesListProps {
|
interface FilteredGamesListProps {
|
||||||
filteredGames: string[];
|
filteredGames: string[];
|
||||||
gameToPositive: Map<string, Set<string>>;
|
gameToPositive: Map<string, Set<string>>;
|
||||||
selectedPeopleCount: number;
|
selectedPeopleCount: number;
|
||||||
|
games: Map<string, GameProto>;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function FilteredGamesList({
|
export function FilteredGamesList({
|
||||||
filteredGames,
|
filteredGames,
|
||||||
gameToPositive,
|
gameToPositive,
|
||||||
selectedPeopleCount,
|
selectedPeopleCount,
|
||||||
|
games,
|
||||||
}: FilteredGamesListProps) {
|
}: FilteredGamesListProps) {
|
||||||
if (selectedPeopleCount === 0) {
|
if (selectedPeopleCount === 0) {
|
||||||
return (
|
return (
|
||||||
@ -31,6 +34,8 @@ export function FilteredGamesList({
|
|||||||
{filteredGames.map((game) => {
|
{filteredGames.map((game) => {
|
||||||
const positiveCount = gameToPositive.get(game)?.size || 0;
|
const positiveCount = gameToPositive.get(game)?.size || 0;
|
||||||
const neutralCount = selectedPeopleCount - positiveCount;
|
const neutralCount = selectedPeopleCount - positiveCount;
|
||||||
|
const gameData = games.get(game);
|
||||||
|
const price = gameData?.price ?? 0;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Link
|
<Link
|
||||||
@ -68,6 +73,21 @@ export function FilteredGamesList({
|
|||||||
{neutralCount > 1 ? "are" : "is"} neutral
|
{neutralCount > 1 ? "are" : "is"} neutral
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
<div
|
||||||
|
className="price-badge"
|
||||||
|
style={{
|
||||||
|
fontSize: "0.85em",
|
||||||
|
marginTop: "0.5rem",
|
||||||
|
padding: "0.2rem 0.6rem",
|
||||||
|
borderRadius: "4px",
|
||||||
|
display: "inline-block",
|
||||||
|
backgroundColor: price === 0 ? "rgba(76, 175, 80, 0.2)" : "rgba(255, 152, 0, 0.2)",
|
||||||
|
color: price === 0 ? "#4caf50" : "#ff9800",
|
||||||
|
fontWeight: 600,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
${price === 0 ? "0 (Free)" : price}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<GameImage game={game} />
|
<GameImage game={game} />
|
||||||
</Link>
|
</Link>
|
||||||
|
|||||||
@ -7,7 +7,13 @@ import {
|
|||||||
} from "../../items";
|
} from "../../items";
|
||||||
import { apiFetch } from "../api";
|
import { apiFetch } from "../api";
|
||||||
|
|
||||||
export function useGameFilter(people: Person[], selectedPeople: Set<string>) {
|
export function useGameFilter(
|
||||||
|
people: Person[],
|
||||||
|
selectedPeople: Set<string>,
|
||||||
|
freeGamesOnly: boolean,
|
||||||
|
maxPrice: number | null,
|
||||||
|
ownershipMode: boolean
|
||||||
|
) {
|
||||||
const [fetchedTitles, setFetchedTitles] = useState<string[]>([]);
|
const [fetchedTitles, setFetchedTitles] = useState<string[]>([]);
|
||||||
const metaDataRef = useRef<{ [key: string]: GameProto }>({});
|
const metaDataRef = useRef<{ [key: string]: GameProto }>({});
|
||||||
|
|
||||||
@ -79,20 +85,63 @@ export function useGameFilter(people: Person[], selectedPeople: Set<string>) {
|
|||||||
.filter((title) => metaDataRef.current[title])
|
.filter((title) => metaDataRef.current[title])
|
||||||
.map((title) => metaDataRef.current[title]);
|
.map((title) => metaDataRef.current[title]);
|
||||||
|
|
||||||
return filterByPlayerCount(games, selectedPeople.size);
|
return filterGames(
|
||||||
|
games,
|
||||||
|
selectedPeople.size,
|
||||||
|
freeGamesOnly,
|
||||||
|
maxPrice,
|
||||||
|
ownershipMode,
|
||||||
|
selectedPeople,
|
||||||
|
people
|
||||||
|
);
|
||||||
// eslint-disable-next-line react-hooks/exhaustive-deps
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [titlesEveryoneWouldPlay, selectedPeople.size, fetchedTitles]);
|
}, [
|
||||||
|
titlesEveryoneWouldPlay,
|
||||||
|
selectedPeople.size,
|
||||||
|
fetchedTitles,
|
||||||
|
freeGamesOnly,
|
||||||
|
maxPrice,
|
||||||
|
ownershipMode,
|
||||||
|
people,
|
||||||
|
selectedPeople,
|
||||||
|
]);
|
||||||
|
|
||||||
return { filteredGames, gameToPositive: gameToPositiveOpinion };
|
const gamesMap = useMemo(() => {
|
||||||
|
return new Map(Object.entries(metaDataRef.current));
|
||||||
|
}, [fetchedTitles]);
|
||||||
|
|
||||||
|
return { filteredGames, gameToPositive: gameToPositiveOpinion, games: gamesMap };
|
||||||
}
|
}
|
||||||
|
|
||||||
function filterByPlayerCount(
|
function filterGames(
|
||||||
games: GameProto[],
|
games: GameProto[],
|
||||||
playerCount: number
|
playerCount: number,
|
||||||
|
freeGamesOnly: boolean,
|
||||||
|
maxPrice: number | null,
|
||||||
|
ownershipMode: boolean,
|
||||||
|
selectedPeople: Set<string>,
|
||||||
|
people: Person[]
|
||||||
): string[] {
|
): string[] {
|
||||||
|
const selectedPersons = people.filter((p) => selectedPeople.has(p.name));
|
||||||
|
|
||||||
return games
|
return games
|
||||||
.filter(
|
.filter(
|
||||||
(game) => game.maxPlayers >= playerCount && game.minPlayers <= playerCount
|
(game) => game.maxPlayers >= playerCount && game.minPlayers <= playerCount
|
||||||
)
|
)
|
||||||
|
.filter((game) => {
|
||||||
|
if (freeGamesOnly) return game.price === 0;
|
||||||
|
if (maxPrice !== null) return game.price <= maxPrice;
|
||||||
|
return true;
|
||||||
|
})
|
||||||
|
.filter((game) => {
|
||||||
|
if (!ownershipMode) return true;
|
||||||
|
if (game.price === 0) return true;
|
||||||
|
|
||||||
|
return selectedPersons.every((person) =>
|
||||||
|
person.opinion.some(
|
||||||
|
(op) => op.title === game.title && op.wouldPlay
|
||||||
|
)
|
||||||
|
);
|
||||||
|
})
|
||||||
.map((game) => game.title);
|
.map((game) => game.title);
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user