Minecraft
/
Stonks
6
0
Fork 1
Code Issues 1 Pull Requests Projects Releases 8 Wiki Activity

Fix aggregatesShowcase error handling

main
Kevin Belisle 2021-09-03 11:45:23 -04:00
parent 34e5e207d9
commit 7c637f181e
1 changed files with 31 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
spa/src/AggregatesShowcase.js
View File

@ -2,59 +2,43 @@ import React from "react";
import { useQuery } from "react-query";
import axios from "axios";
import {
AspectRatio,
Box,
Flex,
Heading,
HStack,
Icon,
SimpleGrid,
Stat,
StatLabel,
StatNumber,
StatHelpText,
StatArrow,
StatGroup,
Tooltip,
} from "@chakra-ui/react";
import { FaUserCircle, FaArrowAltCircleRight } from "react-icons/fa";
import { Link } from "react-router-dom";
import { AutoSizer, WindowScroller, List } from "react-virtualized";
import { SimpleGrid, Stat, StatLabel, StatNumber } from "@chakra-ui/react";
import prettifyStatisticName from "./PrettifyStatisticName";
import StackedBar from "./StackedBar";
const AggregatesShowcase = () => {
const aggregates = useQuery(
`aggregates`,
async () => {
const aggregates = useQuery(`aggregates`, async () => {
const { data } = await axios.get(`/api/aggregates`);
return data;
},
{
placeholderData: [],
}
);
});
const killedAggregates = aggregates.data
const killedAggregates = aggregates.isSuccess
? aggregates.data
.filter((x) => x.type === "minecraft:killed")
.sort((a, b) => b.value - a.value);
const killedTotal = killedAggregates.reduce((acc, val) => acc + val.value, 0);
.sort((a, b) => b.value - a.value)
: [];
// const killedTotal = killedAggregates.reduce((acc, val) => acc + val.value, 0);
const killedByAggregates = aggregates.data
const killedByAggregates = aggregates.isSuccess
? aggregates.data
.filter((x) => x.type === "minecraft:killed_by")
.sort((a, b) => b.value - a.value);
const killedByTotal = killedByAggregates.reduce(
(acc, val) => acc + val.value,
0
);
.sort((a, b) => b.value - a.value)
: [];
// const killedByTotal = killedByAggregates.reduce(
// (acc, val) => acc + val.value,
// 0
// );
const travelAggregates = aggregates.data
.filter((x) => x.type === "minecraft:custom" && x.name.endsWith("one_cm"))
.sort((a, b) => b.value - a.value);
const travelTotal = travelAggregates.reduce((acc, val) => acc + val.value, 0);
const travelAggregates = aggregates.isSuccess
? aggregates.data
.filter(
(x) => x.type === "minecraft:custom" && x.name.endsWith("one_cm")
)
.sort((a, b) => b.value - a.value)
: [];
// const travelTotal = travelAggregates.reduce((acc, val) => acc + val.value, 0);
return aggregates.isFetched ? (
return aggregates.isSuccess ? (
<>
<StackedBar heading="Mobs Killed" aggregates={killedAggregates} />
@ -73,13 +57,13 @@ const AggregatesShowcase = () => {
.map((x, i) => {
var value = x.value;
if (x.name === "minecraft:play_one_minute") {
value = x.value / 20 / 60;
value = Math.floor(x.value / 20 / 60);
}
return (
<Stat key={i}>
<StatLabel>{prettifyStatisticName(x.type, x.name)}</StatLabel>
<StatNumber>{`${x.value
<StatNumber>{`${value
.toString()
.replace(/\B(?=(\d{3})+(?!\d))/g, ",")}`}</StatNumber>
</Stat>