Leahnaya/sendou.ink
1
0
Fork 0
mirror of https://github.com/Sendouc/sendou.ink.git synced 2026-09-14 23:26:15 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

build filters fix crash if main only ability

Browse Source
This commit is contained in:
Kalle (Sendou)
2020-11-27 15:50:26 +02:00
parent a1cff7624c
commit 8d11d1c2a4
3 changed files with 52 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TODO.md
View File

@@ -3,7 +3,7 @@
- [x] Can log in
- [x] Can update builds
- [ ] Build Analyzer
- [ ] Import /analyzer
- [x] Import /analyzer
- [ ] Builds link to /analyzer
- [ ] Builds mode icons
- [ ] Script to parse data from Top 500 .json to the DB

15
components/builds/BuildFilters.tsx
View File

@@ -10,7 +10,7 @@ import {
Radio,
Select,
} from "@chakra-ui/react";
import { Trans } from "@lingui/macro";
import { t, Trans } from "@lingui/macro";
import { Ability } from "@prisma/client";
import AbilityIcon from "components/common/AbilityIcon";
import {
@@ -49,7 +49,8 @@ const BuildFilters: React.FC<Props> = ({ filters, dispatch }) => {
mb="-1.2rem"
fontSize="sm"
color={
filter.abilityPoints!.min > filter.abilityPoints!.max
filter.abilityPoints &&
filter.abilityPoints.min > filter.abilityPoints.max
? "red.500"
: gray
}
@@ -65,7 +66,8 @@ const BuildFilters: React.FC<Props> = ({ filters, dispatch }) => {
mb="-1.2rem"
fontSize="sm"
color={
filter.abilityPoints!.min > filter.abilityPoints!.max
filter.abilityPoints &&
filter.abilityPoints.min > filter.abilityPoints.max
? "red.500"
: gray
}
@@ -162,11 +164,7 @@ const BuildFilters: React.FC<Props> = ({ filters, dispatch }) => {
))}
</Grid>
<Box mt={4}>
<Box as="label" htmlFor="filterAdder" fontSize="sm" ml={2} color={gray}>
Add filter
</Box>
<Select
name="filterAdder"
onChange={(e) =>
dispatch({
type: "ADD_FILTER",
@@ -177,6 +175,9 @@ const BuildFilters: React.FC<Props> = ({ filters, dispatch }) => {
width={48}
m={2}
>
<option hidden value="NO_VALUE">
{t`Filter by ability`}
</option>
{abilities
.filter(
(ability) =>

86
pages/builds/[[...slug]].tsx
View File

@@ -20,7 +20,7 @@ const BuildsPage = () => {
dispatch,
hiddenBuildCount,
} = useBuildsByWeapon();
const { themeColorHex } = useMyTheme();
const { secondaryBgColor, themeColorShade } = useMyTheme();
return (
<>
<Breadcrumbs pages={[{ name: t`Builds` }]} />
@@ -31,49 +31,49 @@ const BuildsPage = () => {
isHeader
/>
<>
<Box mt={4} pr={3} mb="-5rem">
{state.weapon ? (
<WeaponImage name={state.weapon} size={128} />
) : (
<Box w="135px" h="135px" />
)}
</Box>
<Flex
justifyContent="flex-end"
p={2}
mb={8}
w="100%"
bg={themeColorHex}
rounded="lg"
fontSize="sm"
boxShadow="md"
color="black"
>
<Flex
justifyContent="space-between"
fontSize="xs"
textColor="black"
textTransform="uppercase"
letterSpacing="wider"
lineHeight="1rem"
fontWeight="medium"
>
<Box
visibility={
data.length === 0 && hiddenBuildCount === 0
? "hidden"
: undefined
}
>
{data.length} <Trans>builds</Trans>{" "}
{hiddenBuildCount > 0 && (
<>
(+ {hiddenBuildCount} <Trans>hidden</Trans>)
</>
)}
{state.weapon && (
<>
<Box mt={4} pr={3} mb="-5rem">
<WeaponImage name={state.weapon} size={128} />
</Box>
</Flex>
</Flex>
<Flex
justifyContent="flex-end"
p={2}
mb={8}
w="100%"
bg={secondaryBgColor}
rounded="lg"
fontSize="sm"
boxShadow="md"
>
<Flex
justifyContent="space-between"
fontSize="xs"
textColor="black"
textTransform="uppercase"
letterSpacing="wider"
lineHeight="1rem"
fontWeight="medium"
>
<Box
visibility={
data.length === 0 && hiddenBuildCount === 0
? "hidden"
: undefined
}
color={themeColorShade}
>
{data.length} <Trans>builds</Trans>{" "}
{hiddenBuildCount > 0 && (
<>
(+ {hiddenBuildCount} <Trans>hidden</Trans>)
</>
)}
</Box>
</Flex>
</Flex>
</>
)}
</>
{state.weapon && (