diff --git a/frontend-react/src/assets/splatnet/autobomb-rush.svg b/frontend-react/src/assets/splatnet/autobomb-rush.svg new file mode 100644 index 000000000..65b2891f3 --- /dev/null +++ b/frontend-react/src/assets/splatnet/autobomb-rush.svg @@ -0,0 +1,2 @@ + +Spezialwaffeneinsätze \ No newline at end of file diff --git a/frontend-react/src/assets/splatnet/booyah-bomb.svg b/frontend-react/src/assets/splatnet/booyah-bomb.svg new file mode 100644 index 000000000..ce9e0939f --- /dev/null +++ b/frontend-react/src/assets/splatnet/booyah-bomb.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/frontend-react/src/assets/splatnet/bubbleblower.svg b/frontend-react/src/assets/splatnet/bubbleblower.svg new file mode 100644 index 000000000..2103f6a24 --- /dev/null +++ b/frontend-react/src/assets/splatnet/bubbleblower.svg @@ -0,0 +1,2 @@ + +Specials used \ No newline at end of file diff --git a/frontend-react/src/assets/splatnet/burstbomb-rush.svg b/frontend-react/src/assets/splatnet/burstbomb-rush.svg new file mode 100644 index 000000000..1532e9c80 --- /dev/null +++ b/frontend-react/src/assets/splatnet/burstbomb-rush.svg @@ -0,0 +1,2 @@ + +Specials used \ No newline at end of file diff --git a/frontend-react/src/assets/splatnet/curlingbomb-rush.svg b/frontend-react/src/assets/splatnet/curlingbomb-rush.svg new file mode 100644 index 000000000..e257a9544 --- /dev/null +++ b/frontend-react/src/assets/splatnet/curlingbomb-rush.svg @@ -0,0 +1,2 @@ + +Spezialwaffeneinsätze \ No newline at end of file diff --git a/frontend-react/src/assets/splatnet/inkarmor.svg b/frontend-react/src/assets/splatnet/inkarmor.svg new file mode 100644 index 000000000..d4976ff34 --- /dev/null +++ b/frontend-react/src/assets/splatnet/inkarmor.svg @@ -0,0 +1,2 @@ + +Specials used \ No newline at end of file diff --git a/frontend-react/src/assets/splatnet/inkjet.svg b/frontend-react/src/assets/splatnet/inkjet.svg new file mode 100644 index 000000000..a8045d879 --- /dev/null +++ b/frontend-react/src/assets/splatnet/inkjet.svg @@ -0,0 +1,2 @@ + +Specials used \ No newline at end of file diff --git a/frontend-react/src/assets/splatnet/inkstorm.svg b/frontend-react/src/assets/splatnet/inkstorm.svg new file mode 100644 index 000000000..617e73557 --- /dev/null +++ b/frontend-react/src/assets/splatnet/inkstorm.svg @@ -0,0 +1,2 @@ + +Specials used \ No newline at end of file diff --git a/frontend-react/src/assets/splatnet/missiles.svg b/frontend-react/src/assets/splatnet/missiles.svg new file mode 100644 index 000000000..704ad7137 --- /dev/null +++ b/frontend-react/src/assets/splatnet/missiles.svg @@ -0,0 +1,2 @@ + +Specials used \ No newline at end of file diff --git a/frontend-react/src/assets/splatnet/ray.svg b/frontend-react/src/assets/splatnet/ray.svg new file mode 100644 index 000000000..ced599d4f --- /dev/null +++ b/frontend-react/src/assets/splatnet/ray.svg @@ -0,0 +1,2 @@ + +Specials used \ No newline at end of file diff --git a/frontend-react/src/assets/splatnet/splashdown.svg b/frontend-react/src/assets/splatnet/splashdown.svg new file mode 100644 index 000000000..bcdc70094 --- /dev/null +++ b/frontend-react/src/assets/splatnet/splashdown.svg @@ -0,0 +1,2 @@ + +Specials used \ No newline at end of file diff --git a/frontend-react/src/assets/splatnet/splatbomb-rush.svg b/frontend-react/src/assets/splatnet/splatbomb-rush.svg new file mode 100644 index 000000000..93a4afd50 --- /dev/null +++ b/frontend-react/src/assets/splatnet/splatbomb-rush.svg @@ -0,0 +1,2 @@ + +Spezialwaffeneinsätze \ No newline at end of file diff --git a/frontend-react/src/assets/splatnet/stamp.svg b/frontend-react/src/assets/splatnet/stamp.svg new file mode 100644 index 000000000..2e5febd6c --- /dev/null +++ b/frontend-react/src/assets/splatnet/stamp.svg @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/frontend-react/src/assets/splatnet/suction-rush.svg b/frontend-react/src/assets/splatnet/suction-rush.svg new file mode 100644 index 000000000..2e21e4348 --- /dev/null +++ b/frontend-react/src/assets/splatnet/suction-rush.svg @@ -0,0 +1,2 @@ + +Specials used \ No newline at end of file diff --git a/frontend-react/src/components/builds/GearImage.tsx b/frontend-react/src/components/builds/GearImage.tsx index f64102d57..aee4b6a1a 100644 --- a/frontend-react/src/components/builds/GearImage.tsx +++ b/frontend-react/src/components/builds/GearImage.tsx @@ -16,6 +16,7 @@ const GearImage: React.FC = ({ }) => { if (!englishName && renderNullIfNoName) return null if (!englishName) return + const wh = mini ? "32px" : "128px" return ( {englishName} = ({ mini ? "-icon" : "" }/${english_internal[englishName]}.png`} title={englishName} + style={{ width: wh, height: wh }} /> ) } diff --git a/frontend-react/src/components/common/SplatnetIcon.tsx b/frontend-react/src/components/common/SplatnetIcon.tsx index 559365b6a..b54c71b12 100644 --- a/frontend-react/src/components/common/SplatnetIcon.tsx +++ b/frontend-react/src/components/common/SplatnetIcon.tsx @@ -1,24 +1,179 @@ import React, { useContext } from "react" -import { ReactComponent as KillsSvg } from "../../assets/splatnet/kills.svg" -import { ReactComponent as DeathSvg } from "../../assets/splatnet/deaths.svg" -import { ReactComponent as BallerSvg } from "../../assets/splatnet/baller.svg" import { ReactComponent as ColorDefs } from "../../assets/splatnet/colorDefs.svg" + +import { ReactComponent as Kills } from "../../assets/splatnet/kills.svg" +import { ReactComponent as Deaths } from "../../assets/splatnet/deaths.svg" + +import { ReactComponent as Baller } from "../../assets/splatnet/baller.svg" +import { ReactComponent as BooyahBomb } from "../../assets/splatnet/booyah-bomb.svg" +import { ReactComponent as BubbleBlower } from "../../assets/splatnet/bubbleblower.svg" +import { ReactComponent as BurstBombRush } from "../../assets/splatnet/burstbomb-rush.svg" +import { ReactComponent as InkArmor } from "../../assets/splatnet/inkarmor.svg" +import { ReactComponent as Inkjet } from "../../assets/splatnet/inkjet.svg" +import { ReactComponent as Inkstorm } from "../../assets/splatnet/inkstorm.svg" +import { ReactComponent as Missiles } from "../../assets/splatnet/missiles.svg" +import { ReactComponent as Stingray } from "../../assets/splatnet/ray.svg" +import { ReactComponent as Splashdown } from "../../assets/splatnet/splashdown.svg" +import { ReactComponent as UltraStamp } from "../../assets/splatnet/stamp.svg" +import { ReactComponent as SuctionRush } from "../../assets/splatnet/suction-rush.svg" +import { ReactComponent as SplatBombRush } from "../../assets/splatnet/splatbomb-rush.svg" +import { ReactComponent as AutoBombRush } from "../../assets/splatnet/autobomb-rush.svg" +import { ReactComponent as CurlingBombRush } from "../../assets/splatnet/curlingbomb-rush.svg" + import "./SplatoonIcon.css" import MyThemeContext from "../../themeContext" +import { Weapon } from "../../types" -interface SplatnetIconProps {} +const weaponToSvg = { + "Sploosh-o-matic": Splashdown, + "Neo Sploosh-o-matic": Missiles, + "Sploosh-o-matic 7": UltraStamp, + "Splattershot Jr.": InkArmor, + "Custom Splattershot Jr.": Inkstorm, + "Kensa Splattershot Jr.": BubbleBlower, + "Splash-o-matic": Inkjet, + "Neo Splash-o-matic": SuctionRush, + "Aerospray MG": CurlingBombRush, + "Aerospray RG": Baller, + "Aerospray PG": BooyahBomb, + Splattershot: Splashdown, + "Tentatek Splattershot": Inkjet, + "Kensa Splattershot": Missiles, + ".52 Gal": Baller, + ".52 Gal Deco": Stingray, + "Kensa .52 Gal": BooyahBomb, + "N-ZAP '85": InkArmor, + "N-ZAP '89": Missiles, + "N-ZAP '83": Inkstorm, + "Splattershot Pro": Inkstorm, + "Forge Splattershot Pro": BubbleBlower, + "Kensa Splattershot Pro": BooyahBomb, + ".96 Gal": InkArmor, + ".96 Gal Deco": Splashdown, + "Jet Squelcher": Missiles, + "Custom Jet Squelcher": Stingray, + "Luna Blaster": Baller, + "Luna Blaster Neo": SuctionRush, + "Kensa Luna Blaster": Inkstorm, + Blaster: Splashdown, + "Custom Blaster": Inkjet, + "Range Blaster": Inkstorm, + "Custom Range Blaster": BubbleBlower, + "Grim Range Blaster": Missiles, + "Clash Blaster": Stingray, + "Clash Blaster Neo": Missiles, + "Rapid Blaster": SplatBombRush, + "Rapid Blaster Deco": Inkjet, + "Kensa Rapid Blaster": Baller, + "Rapid Blaster Pro": Inkstorm, + "Rapid Blaster Pro Deco": InkArmor, + "L-3 Nozzlenose": Baller, + "L-3 Nozzlenose D": Inkjet, + "Kensa L-3 Nozzlenose": UltraStamp, + "H-3 Nozzlenose": Missiles, + "H-3 Nozzlenose D": InkArmor, + "Cherry H-3 Nozzlenose": BubbleBlower, + Squeezer: Stingray, + "Foil Squeezer": BubbleBlower, + "Carbon Roller": Inkstorm, + "Carbon Roller Deco": AutoBombRush, + "Splat Roller": Splashdown, + "Krak-On Splat Roller": Baller, + "Kensa Splat Roller": BubbleBlower, + "Dynamo Roller": Stingray, + "Gold Dynamo Roller": InkArmor, + "Kensa Dynamo Roller": BooyahBomb, + "Flingza Roller": SplatBombRush, + "Foil Flingza Roller": Missiles, + Inkbrush: Splashdown, + "Inkbrush Nouveau": Baller, + "Permanent Inkbrush": InkArmor, + Octobrush: Inkjet, + "Octobrush Nouveau": Missiles, + "Kensa Octobrush": UltraStamp, + "Classic Squiffer": InkArmor, + "New Squiffer": Baller, + "Fresh Squiffer": Inkjet, + "Splat Charger": Stingray, + "Firefin Splat Charger": SuctionRush, + "Kensa Charger": Baller, + Splatterscope: Stingray, + "Firefin Splatterscope": SuctionRush, + "Kensa Splatterscope": Baller, + "E-liter 4K": Inkstorm, + "Custom E-liter 4K": BubbleBlower, + "E-liter 4K Scope": Inkstorm, + "Custom E-liter 4K Scope": BubbleBlower, + "Bamboozler 14 Mk I": Missiles, + "Bamboozler 14 Mk II": BurstBombRush, + "Bamboozler 14 Mk III": BubbleBlower, + "Goo Tuber": Splashdown, + "Custom Goo Tuber": Inkjet, + Slosher: Missiles, + "Slosher Deco": Baller, + "Soda Slosher": BurstBombRush, + "Tri-Slosher": InkArmor, + "Tri-Slosher Nouveau": Inkstorm, + "Sloshing Machine": Stingray, + "Sloshing Machine Neo": SplatBombRush, + "Kensa Sloshing Machine": Splashdown, + Bloblobber: Inkstorm, + "Bloblobber Deco": SuctionRush, + Explosher: BubbleBlower, + "Custom Explosher": Baller, + "Mini Splatling": Missiles, + "Zink Mini Splatling": Inkstorm, + "Kensa Mini Splatling": UltraStamp, + "Heavy Splatling": Stingray, + "Heavy Splatling Deco": BubbleBlower, + "Heavy Splatling Remix": BooyahBomb, + "Hydra Splatling": Splashdown, + "Custom Hydra Splatling": InkArmor, + "Ballpoint Splatling": Inkjet, + "Ballpoint Splatling Nouveau": Inkstorm, + "Nautilus 47": Baller, + "Nautilus 79": Inkjet, + "Dapple Dualies": SuctionRush, + "Dapple Dualies Nouveau": Inkstorm, + "Clear Dapple Dualies": Splashdown, + "Splat Dualies": Missiles, + "Enperry Splat Dualies": Inkjet, + "Kensa Splat Dualies": Baller, + "Glooga Dualies": Inkjet, + "Glooga Dualies Deco": Baller, + "Kensa Glooga Dualies": InkArmor, + "Dualie Squelchers": Missiles, + "Custom Dualie Squelchers": Inkstorm, + "Dark Tetra Dualies": Splashdown, + "Light Tetra Dualies": AutoBombRush, + "Splat Brella": Inkstorm, + "Sorella Brella": SplatBombRush, + "Tenta Brella": BubbleBlower, + "Tenta Sorella Brella": CurlingBombRush, + "Tenta Camo Brella": UltraStamp, + "Undercover Brella": Splashdown, + "Undercover Sorella Brella": Baller, + "Kensa Undercover Brella": InkArmor, + kills: Kills, + deaths: Deaths, +} as const -const SplatnetIcon: React.FC = ({}) => { +interface SplatnetIconProps { + iconFor: "kills" | "deaths" | Weapon +} + +const SplatnetIcon: React.FC = ({ iconFor }) => { const { themeColorHex } = useContext(MyThemeContext) const style = { - width: "100px", + width: "35px", height: "auto", "--main-bg-color": themeColorHex, } as React.CSSProperties + const Component = weaponToSvg[iconFor] return ( <> - - + + ) } diff --git a/frontend-react/src/components/common/SplatoonIcon.css b/frontend-react/src/components/common/SplatoonIcon.css index d8f47169c..2288bc2c9 100644 --- a/frontend-react/src/components/common/SplatoonIcon.css +++ b/frontend-react/src/components/common/SplatoonIcon.css @@ -59,7 +59,7 @@ fill: none; } .special-icon1-svg .white { - fill: #000; + fill: #fff; } .special-icon10-svg .bg1 { fill: var(--main-bg-color); diff --git a/frontend-react/src/components/common/WeaponImage.tsx b/frontend-react/src/components/common/WeaponImage.tsx index d1882ce38..2506f720d 100644 --- a/frontend-react/src/components/common/WeaponImage.tsx +++ b/frontend-react/src/components/common/WeaponImage.tsx @@ -11,11 +11,13 @@ interface WeaponImageProps { const WeaponImage: React.FC = ({ englishName, size }) => { const dictToUse: any = size === "MEDIUM" ? wpnMedium : wpnSmall + const wh = size === "MEDIUM" ? "128px" : "32px" return ( {englishName} ) } diff --git a/frontend-react/src/components/plusdraftcup/DraftCupDetails.tsx b/frontend-react/src/components/plusdraftcup/DraftCupDetails.tsx index a8e53f76d..25c4a46b2 100644 --- a/frontend-react/src/components/plusdraftcup/DraftCupDetails.tsx +++ b/frontend-react/src/components/plusdraftcup/DraftCupDetails.tsx @@ -44,7 +44,12 @@ interface DetailedMapCardProps { const abilityMap = (ability: Ability, index: number) => { const gridArea = `5 / ${1 + index} / 6 / ${2 + index}` return ( - + ) @@ -67,104 +72,149 @@ const DetailedMapCard: React.FC = ({ MyThemeContext ) return ( - <> - - + - - {gameNumber}. - - {mapDetails.stage} - - - {[mapDetails.winners, mapDetails.losers].map((teamInfo, index) => { - return ( + {gameNumber}. + + {mapDetails.stage} + + + {[mapDetails.winners, mapDetails.losers].map((teamInfo, index) => { + return ( + - - - {index === 0 ? "VICTORY" : "DEFEAT"} - - - {teamInfo.score === 100 ? "KO" : teamInfo.score} - - - {teamInfo.team_name} - - - - {teamInfo.players.map((player, index) => ( - - - {player.discord_user.username} - - - {player.paint}p - - - - {" "} - {player.gear.map(gearMap)} - {player.main_abilities.map(abilityMap)} - - {player.sub_abilities.flat().map(ability => ( - - ))} - - - ))} - + + {index === 0 ? "VICTORY" : "DEFEAT"} + + + {teamInfo.score === 100 ? "KO" : teamInfo.score} + + + {teamInfo.team_name} + - ) - })} - - + + {teamInfo.players.map((player, index) => ( + + + {player.discord_user.username} + + + {player.paint}p + + + + {" "} + {player.gear.map(gearMap)} + {player.main_abilities.map(abilityMap)} + + {player.sub_abilities.flat().map((ability, index) => ( + <> + {(index === 3 || index === 6) && } + + + ))} + + + + + + + + + + + + x + {player.kills + player.assists} + + ({player.assists}) + + + + + x + + {player.deaths} + + + + x + + {player.specials} + + + ))} + + + ) + })} + ) } diff --git a/frontend-react/src/components/plusdraftcup/DraftCupPage.tsx b/frontend-react/src/components/plusdraftcup/DraftCupPage.tsx index 4ba734cfe..64c932e03 100644 --- a/frontend-react/src/components/plusdraftcup/DraftCupPage.tsx +++ b/frontend-react/src/components/plusdraftcup/DraftCupPage.tsx @@ -18,8 +18,6 @@ const DraftCupPage: React.FC = () => { if (error) return if (loading) return - console.log("data", data) - return ( <>