Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes on "Museum" page #129

Merged
merged 3 commits into from
Dec 5, 2024
Merged

Changes on "Museum" page #129

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
82d1351
refactor(museum): remove use of a magic number
softy-dev Nov 30, 2024
99c1a58
fix(museum): remove re-render with useEffect
softy-dev Nov 30, 2024
9e18123
feat(museum): add numerical counter on filters
softy-dev Nov 30, 2024
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
67 changes: 32 additions & 35 deletions src/pages/museum.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import achievements from "@/data/achievements.json";
import museum from "@/data/museum.json";

import { MuseumItem } from "@/types/items";
import { useEffect, useState } from "react";
import { useState, useMemo } from "react";

import { AchievementCard } from "@/components/cards/achievement-card";
import { BooleanCard } from "@/components/cards/boolean-card";
Expand All @@ -20,35 +20,33 @@ import {
import { usePlayers } from "@/contexts/players-context";
import { usePreferences } from "@/contexts/preferences-context";

const reqs: Record<string, number> = {
"A Complete Collection": Object.values(museum).flatMap((item) =>
Object.values(item),
).length,
"Treasure Trove": 40,
};

export default function Museum() {
const [open, setIsOpen] = useState(false);
const [museumArtifact, setMuseumArtifact] = useState<MuseumItem | null>(null);

const [_artifactFilter, setArtifactFilter] = useState("all");
const [_mineralFilter, setMineralFilter] = useState("all");

const [museumArtifactCollected, setMuseumArtifactCollected] = useState<
Set<string>
>(new Set());

const [museumMineralCollected, setMuseumMineralCollected] = useState<
Set<string>
>(new Set());

const { activePlayer } = usePlayers();
const { show, toggleShow } = usePreferences();

// unblur dialog
const [showPrompt, setPromptOpen] = useState(false);

useEffect(() => {
if (activePlayer) {
setMuseumArtifactCollected(
new Set(activePlayer?.museum?.artifacts ?? []),
);
setMuseumMineralCollected(new Set(activePlayer?.museum?.minerals ?? []));
}
}, [activePlayer]);
const [museumArtifactCollected, museumMineralCollected] = useMemo(
() => [
new Set<string>(activePlayer?.museum?.artifacts ?? []),
new Set<string>(activePlayer?.museum?.minerals ?? []),
],
[activePlayer],
);

const getAchievementProgress = (name: string) => {
let completed = false;
Expand All @@ -57,27 +55,26 @@ export default function Museum() {
if (!activePlayer || !activePlayer.museum)
return { completed, additionalDescription };

if (name === "Treasure Trove") {
completed =
museumArtifactCollected.size + museumMineralCollected.size >= 40;
if (!completed) {
additionalDescription = ` - ${
40 - (museumArtifactCollected.size + museumMineralCollected.size)
} more`;
}
} else {
completed =
museumArtifactCollected.size + museumMineralCollected.size >= 95;
const collection =
museumArtifactCollected.size + museumMineralCollected.size;

if (Object.hasOwn(reqs, name)) {
completed = collection >= reqs[name];
if (!completed) {
additionalDescription = ` - ${
95 - (museumArtifactCollected.size + museumMineralCollected.size)
} more`;
additionalDescription = ` - ${reqs[name] - collection} left`;
}
}

return { completed, additionalDescription };
};

const remainingDonations = {
artifacts:
Object.values(museum.artifacts).length - museumArtifactCollected.size,
minerals:
Object.values(museum.minerals).length - museumMineralCollected.size,
};

return (
<>
<Head>
Expand Down Expand Up @@ -152,13 +149,13 @@ export default function Museum() {
<FilterButton
target={"0"}
_filter={_artifactFilter}
title="Not Donated"
title={`Not Donated (${remainingDonations.artifacts})`}
setFilter={setArtifactFilter}
/>
<FilterButton
target={"2"}
_filter={_artifactFilter}
title="Donated"
title={`Donated (${museumArtifactCollected.size})`}
setFilter={setArtifactFilter}
/>
</div>
Expand Down Expand Up @@ -197,13 +194,13 @@ export default function Museum() {
<FilterButton
target={"0"}
_filter={_mineralFilter}
title="Not Donated"
title={`Not Donated (${remainingDonations.minerals})`}
setFilter={setMineralFilter}
/>
<FilterButton
target={"2"}
_filter={_mineralFilter}
title="Donated"
title={`Donated (${museumMineralCollected.size})`}
setFilter={setMineralFilter}
/>
</div>
Expand Down