diff --git a/react-ui/src/assets/abilityIcons/UNKNOWN.png b/react-ui/src/assets/abilityIcons/UNKNOWN.png new file mode 100644 index 000000000..2d543e5e5 Binary files /dev/null and b/react-ui/src/assets/abilityIcons/UNKNOWN.png differ diff --git a/react-ui/src/assets/imageImports.js b/react-ui/src/assets/imageImports.js index 4ec5902d2..ea26cc533 100644 --- a/react-ui/src/assets/imageImports.js +++ b/react-ui/src/assets/imageImports.js @@ -24,6 +24,7 @@ import T from "./abilityIcons/T.png" import TI from "./abilityIcons/TI.png" import OS from "./abilityIcons/OS.png" import AD from "./abilityIcons/AD.png" +import UNKNOWN from "./abilityIcons/UNKNOWN.png" import szIcon from "./sz.png" import tcIcon from "./tc.png" @@ -93,7 +94,9 @@ export const abilityIcons = { T: T, TI: TI, OS: OS, - AD: AD + AD: AD, + UNKNOWN: UNKNOWN, + "": UNKNOWN } export const abilitiesGameOrder = [ diff --git a/react-ui/src/components/common/AbilityIcon.js b/react-ui/src/components/common/AbilityIcon.js index 93e72c88f..89e250fe5 100644 --- a/react-ui/src/components/common/AbilityIcon.js +++ b/react-ui/src/components/common/AbilityIcon.js @@ -34,7 +34,7 @@ const AbilityIcon = ({ style = {}, onClick = null }) => { - if (!ability) return null + if (ability == null) return null return ( { - return <>build card here +import { wpnMedium } from "../../assets/imageImports" + +const BuildCard = ({ + build, + existingAbilities, + setAbilities, + removeBuildFunction, + editBuildFunction +}) => { + console.log("build", build) + return ( + + + + + + {build.title} + + + + {build.headgearItem && ( + + )} + + {build.headgear.map((ability, index) => ( + + + + ))} + + + + + ) } export default BuildCard diff --git a/react-ui/src/components/user/AddBuildForm.js b/react-ui/src/components/user/AddBuildForm.js index 1d12753c2..e7d41ffc9 100644 --- a/react-ui/src/components/user/AddBuildForm.js +++ b/react-ui/src/components/user/AddBuildForm.js @@ -28,9 +28,9 @@ const AddBuildForm = ({ ] : [["", "", "", ""], ["", "", "", ""], ["", "", "", ""]] ) - const [head, setHead] = useState("") - const [clothes, setClothes] = useState("") - const [shoes, setShoes] = useState("") + const [headgearItem, setHeadgear] = useState("") + const [clothingItem, setClothing] = useState("") + const [shoesItem, setShoes] = useState("") const build = { id: existingBuild ? existingBuild.id : null, @@ -38,7 +38,10 @@ const AddBuildForm = ({ title, headgear: abilities[0], clothing: abilities[1], - shoes: abilities[2] + shoes: abilities[2], + headgearItem, + clothingItem, + shoesItem } const submit = async e => { @@ -106,11 +109,11 @@ const AddBuildForm = ({ - + - + diff --git a/react-ui/src/components/user/BuildTab.js b/react-ui/src/components/user/BuildTab.js index e4f5951e4..1dbbeac23 100644 --- a/react-ui/src/components/user/BuildTab.js +++ b/react-ui/src/components/user/BuildTab.js @@ -1,6 +1,6 @@ import React, { useState } from "react" import { useQuery, useMutation } from "@apollo/react-hooks" -import { Button, Message } from "semantic-ui-react" +import { Button, Message, Card } from "semantic-ui-react" import { addBuild } from "../../graphql/mutations/addBuild" import { searchForBuilds } from "../../graphql/queries/searchForBuilds" @@ -123,21 +123,20 @@ const BuildTab = ({ user, userViewed }) => { ) : null} -
+ {data.searchForBuilds.map(b => ( -
- -
+ ))} {data.searchForBuilds.length === 0 ? "So far this user has no builds!" : null} -
+ ) }