From 72ec9d66510b2002cf6c598c3c9283a11fd7f726 Mon Sep 17 00:00:00 2001 From: notV4l Date: Mon, 25 Mar 2024 15:14:26 +0100 Subject: [PATCH] update drug images --- web/public/images/drugs/acid.svg | 61 +++++++++ web/public/images/drugs/cocaine.svg | 114 ++++++++++++++++ web/public/images/drugs/heroin.svg | 62 +++++++++ web/public/images/drugs/ketamine.svg | 55 ++++++++ web/public/images/drugs/ludes.svg | 124 ++++++++++++++++++ web/public/images/drugs/shrooms.svg | 63 +++++++++ web/public/images/drugs/speed.svg | 123 +++++++++++++++++ web/public/images/drugs/weed.svg | 96 ++++++++++++++ web/src/components/hustlers/Dragon.tsx | 7 +- web/src/components/hustlers/Monkey.tsx | 4 +- web/src/components/hustlers/Rabbit.tsx | 4 +- web/src/components/hustlers/index.tsx | 3 +- web/src/components/pages/home/HallOfFame.tsx | 5 +- .../[drugSlug]/[tradeDirection].tsx | 2 +- 14 files changed, 711 insertions(+), 12 deletions(-) create mode 100644 web/public/images/drugs/acid.svg create mode 100644 web/public/images/drugs/cocaine.svg create mode 100644 web/public/images/drugs/heroin.svg create mode 100644 web/public/images/drugs/ketamine.svg create mode 100644 web/public/images/drugs/ludes.svg create mode 100644 web/public/images/drugs/shrooms.svg create mode 100644 web/public/images/drugs/speed.svg create mode 100644 web/public/images/drugs/weed.svg diff --git a/web/public/images/drugs/acid.svg b/web/public/images/drugs/acid.svg new file mode 100644 index 000000000..97e20bdee --- /dev/null +++ b/web/public/images/drugs/acid.svg @@ -0,0 +1,61 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/public/images/drugs/cocaine.svg b/web/public/images/drugs/cocaine.svg new file mode 100644 index 000000000..39aefeb20 --- /dev/null +++ b/web/public/images/drugs/cocaine.svg @@ -0,0 +1,114 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/public/images/drugs/heroin.svg b/web/public/images/drugs/heroin.svg new file mode 100644 index 000000000..b4f3f1f19 --- /dev/null +++ b/web/public/images/drugs/heroin.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/public/images/drugs/ketamine.svg b/web/public/images/drugs/ketamine.svg new file mode 100644 index 000000000..e74d8fbec --- /dev/null +++ b/web/public/images/drugs/ketamine.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/public/images/drugs/ludes.svg b/web/public/images/drugs/ludes.svg new file mode 100644 index 000000000..ea5592405 --- /dev/null +++ b/web/public/images/drugs/ludes.svg @@ -0,0 +1,124 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/public/images/drugs/shrooms.svg b/web/public/images/drugs/shrooms.svg new file mode 100644 index 000000000..bc6bfe1af --- /dev/null +++ b/web/public/images/drugs/shrooms.svg @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/public/images/drugs/speed.svg b/web/public/images/drugs/speed.svg new file mode 100644 index 000000000..d68c4445a --- /dev/null +++ b/web/public/images/drugs/speed.svg @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/public/images/drugs/weed.svg b/web/public/images/drugs/weed.svg new file mode 100644 index 000000000..d4698f47b --- /dev/null +++ b/web/public/images/drugs/weed.svg @@ -0,0 +1,96 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/web/src/components/hustlers/Dragon.tsx b/web/src/components/hustlers/Dragon.tsx index d8eacf7ac..d642ccbc5 100644 --- a/web/src/components/hustlers/Dragon.tsx +++ b/web/src/components/hustlers/Dragon.tsx @@ -81,8 +81,7 @@ export const Dragon = (props: IconProps) => { ); }; - -export const DragonIcon = ({color, ...props}: { color: string } & IconProps) => { +export const DragonIcon = ({ color, ...props }: IconProps) => { return ( fillRule="evenodd" clipRule="evenodd" d="M0 6V7.5H1.5V9H6V10.5H1.5V12H4.5V13.5H3V15H1.5V16.5H3V15H7.5V13.5H12V18H7.5V19.5H4.5V21H3V24H22.5V21H21V19.5H18V18H15V16.5H21V15H19.5V13.5H22.5V12H24V9H22.5V10.5H21V9H19.5V6H18V4.5H19.5V1.5H18V4.5H10.5V3H9V1.5H7.5V4.5H9V6H6V4.5H3V3H1.5V4.5H3V6H6V7.5H1.5V6H0ZM19.5 9H18V10.5H19.5V9Z" - fill={color} + fill={color as string} /> - + ); }; diff --git a/web/src/components/hustlers/Monkey.tsx b/web/src/components/hustlers/Monkey.tsx index 169342e57..7ec9559de 100644 --- a/web/src/components/hustlers/Monkey.tsx +++ b/web/src/components/hustlers/Monkey.tsx @@ -62,7 +62,7 @@ export const Monkey = (props: IconProps) => { ); }; -export const MonkeyIcon = ({ color, ...props }: { color: string } & IconProps) => { +export const MonkeyIcon = ({ color, ...props }: IconProps) => { return ( @@ -100,7 +100,7 @@ export const MonkeyIcon = ({ color, ...props }: { color: string } & IconProps) = > diff --git a/web/src/components/hustlers/Rabbit.tsx b/web/src/components/hustlers/Rabbit.tsx index b51a85003..40829e994 100644 --- a/web/src/components/hustlers/Rabbit.tsx +++ b/web/src/components/hustlers/Rabbit.tsx @@ -65,7 +65,7 @@ export const Rabbit = (props: IconProps) => { ); }; -export const RabbitIcon = ({ color, ...props }: { color: string } & IconProps) => { +export const RabbitIcon = ({ color, ...props }: IconProps) => { return ( @@ -112,7 +112,7 @@ export const RabbitIcon = ({ color, ...props }: { color: string } & IconProps) = > diff --git a/web/src/components/hustlers/index.tsx b/web/src/components/hustlers/index.tsx index 578234b12..e97efd0b4 100644 --- a/web/src/components/hustlers/index.tsx +++ b/web/src/components/hustlers/index.tsx @@ -17,7 +17,6 @@ interface HustlerProps { interface HustlerIconProps { hustler: Hustlers; - color: string, } const hustlers = { @@ -39,7 +38,7 @@ const hustlersIcons = { [Hustlers.Rabbit]: RabbitIcon, }; -export const HustlerIcon = ({ hustler, color = colors.neon["400"], ...rest }: HustlerIconProps & IconProps) => { +export const HustlerIcon = ({ hustler, color = colors.neon["400"].toString(), ...rest }: HustlerIconProps & IconProps) => { const SelectedHustlerIcon = hustlersIcons[hustler]; return ; }; diff --git a/web/src/components/pages/home/HallOfFame.tsx b/web/src/components/pages/home/HallOfFame.tsx index 97fa4c578..3e1357d77 100644 --- a/web/src/components/pages/home/HallOfFame.tsx +++ b/web/src/components/pages/home/HallOfFame.tsx @@ -4,6 +4,7 @@ import { useConfigStore, useDojoContext, useRouterContext } from "@/dojo/hooks"; import { useGameById } from "@/dojo/hooks/useGameById"; import { useHallOfFame } from "@/dojo/hooks/useHallOfFame"; import { Leaderboard } from "@/generated/graphql"; +import colors from "@/theme/colors"; import { formatCash } from "@/utils/ui"; import { Card, HStack, SimpleGrid, Text, VStack } from "@chakra-ui/react"; import { useAccount } from "@starknet-react/core"; @@ -52,6 +53,8 @@ const HallOfFameEntry = ({ entry, account }: { entry: Leaderboard; account: Acco router.push(`/0x${entry.game_id.toString(16)}/logs`); }, [entry.game_id, game?.player_id, router]); + const color = isSelf ? colors.yellow["400"].toString() : colors.neon["400"].toString() + if (!isFetched) return null; return ( @@ -67,7 +70,7 @@ const HallOfFameEntry = ({ entry, account }: { entry: Leaderboard; account: Acco { > - {drug.name} + {drug.name} {market.weight} lb