Skip to content

create incomplete/complete filter for bundles #144

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

Open
CodingFella wants to merge 2 commits into
base: main
Choose a base branch
from
Open

create incomplete/complete filter for bundles #144

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3abe88
create incomplete/complete filter for bundles
CodingFella Jan 21, 2025
5fdbac5
Update bundles.tsx
CodingFella Jan 21, 2025
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
36 changes: 32 additions & 4 deletions src/pages/bundles.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,12 @@ import {
} from "@/components/ui/accordion";
import { Progress } from "@/components/ui/progress";
import { useMediaQuery } from "@react-hook/media-query";
import { IconSettings } from "@tabler/icons-react";
import { IconClock, IconCloud, IconSettings } from '@tabler/icons-react';
import clsx from "clsx";
import { useEffect, useState } from "react";
import { isNumber } from "util";
import { FilterButton, FilterSearch } from '@/components/filter-btn';
import { Command, CommandInput } from '@/components/ui/command';

export const ItemQualityToString = {
"0": "Normal",
Expand Down Expand Up @@ -415,6 +417,8 @@ export default function Bundles() {
const [showPrompt, setPromptOpen] = useState(false);
const { show, toggleShow } = usePreferences();

const [_filter, setFilter] = useState("all");

let [open, setIsOpen] = useState(false);
let [object, setObject] = useState<BundleItemWithLocation | null>(null);
let [bundles, setBundles] = useState<BundleWithStatus[]>([]);
Expand Down Expand Up @@ -489,9 +493,10 @@ export default function Bundles() {

let completed = false;
let additionalDescription = "";
let completedCount = 0;

if (name === "Local Legend") {
let completedCount = bundles.reduce((acc, curBundelRet) => {
completedCount = bundles.reduce((acc, curBundelRet) => {
if (BundleCompleted(curBundelRet)) return acc + 1;
return acc;
}, 0);
Expand All @@ -503,7 +508,7 @@ export default function Bundles() {

if (activePlayer?.general?.jojaMembership?.isMember) {
if (name === "Joja Co. Member Of The Year") {
let completedCount =
completedCount =
activePlayer?.general?.jojaMembership?.developmentProjects?.length;
completed = completedCount >= 5;
if (!completed) {
Expand All @@ -512,7 +517,7 @@ export default function Bundles() {
}
}

return { completed, additionalDescription };
return { completed, additionalDescription, completedCount };
};

return (
Expand Down Expand Up @@ -561,6 +566,23 @@ export default function Bundles() {
);
})}
</AccordionSection>
{/* Filters */}
<div className="grid grid-cols-1 justify-between gap-2 lg:flex">
<div className="grid grid-cols-2 gap-2 sm:flex sm:gap-3">
<FilterButton
target={"0"}
_filter={_filter}
title={`Incomplete (${31 - (getAchievementProgress("Local Legend")?.["completedCount"] ?? 0)})`}
setFilter={setFilter}
/>
<FilterButton
target={"2"}
_filter={_filter}
title={`Completed (${(getAchievementProgress("Local Legend")?.["completedCount"] ?? 0)})`}
setFilter={setFilter}
/>
</div>
</div>
{CommunityCenterRooms.map((roomName: CommunityCenterRoomName) => {
let roomBundles: BundleWithStatus[] = [];
let completedCount = 0;
Expand All @@ -571,6 +593,12 @@ export default function Bundles() {
} else {
return false;
}
}).filter((f) => {
if (_filter === "0") {
return f.bundleStatus.slice(0, f.bundle.items.length).includes(false);
} else if (_filter === "2") {
return !f.bundleStatus.slice(0, f.bundle.items.length).includes(false);
} else return true; // all
});
completedCount = roomBundles.reduce((acc, curBundelRet) => {
if (BundleCompleted(curBundelRet)) return acc + 1;
Expand Down