From d262efb7353ecd2b73b411cb906a38f8040c769c Mon Sep 17 00:00:00 2001 From: Fluffy9 <29765579+Fluffy9@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:47:36 -0400 Subject: [PATCH 01/16] Tile detail UI elements --- .../src/components/TileDetails/Monsters.tsx | 28 ++++++++++++++++ .../src/components/TileDetails/Players.tsx | 16 +++++++++ .../src/components/TileDetails/SafeZone.tsx | 32 ++++++++++++++++++ packages/client/src/pages/GameBoard.tsx | 33 +++++++++++++++++-- packages/client/src/utils/theme.ts | 1 - 5 files changed, 106 insertions(+), 4 deletions(-) create mode 100644 packages/client/src/components/TileDetails/Monsters.tsx create mode 100644 packages/client/src/components/TileDetails/Players.tsx create mode 100644 packages/client/src/components/TileDetails/SafeZone.tsx diff --git a/packages/client/src/components/TileDetails/Monsters.tsx b/packages/client/src/components/TileDetails/Monsters.tsx new file mode 100644 index 000000000..dd59d7777 --- /dev/null +++ b/packages/client/src/components/TileDetails/Monsters.tsx @@ -0,0 +1,28 @@ +import { Box, Heading, HStack, Spacer, Text } from '@chakra-ui/react'; + +export const Monsters = (): JSX.Element => { + return ( + + Monsters + + + Kobold + + Level 2 + + + + Green Slime + + Level 2 + + + + Cave Bandit + + Level 2 + {' '} + + + ); +}; diff --git a/packages/client/src/components/TileDetails/Players.tsx b/packages/client/src/components/TileDetails/Players.tsx new file mode 100644 index 000000000..8bab2dd67 --- /dev/null +++ b/packages/client/src/components/TileDetails/Players.tsx @@ -0,0 +1,16 @@ +import { Box, Heading, Text, VStack } from '@chakra-ui/react'; + +export const Players = (): JSX.Element => { + return ( + + Players + + Mon-o 🧙‍♂️ + GUATY 🎭 + Wolf R ※ + GUATY 🎭 + Wolf R ※ + + + ); +}; diff --git a/packages/client/src/components/TileDetails/SafeZone.tsx b/packages/client/src/components/TileDetails/SafeZone.tsx new file mode 100644 index 000000000..b427b5b32 --- /dev/null +++ b/packages/client/src/components/TileDetails/SafeZone.tsx @@ -0,0 +1,32 @@ +import { Box, Heading, HStack, Text, VStack } from '@chakra-ui/react'; +import { IoIosArrowForward } from 'react-icons/io'; + +export const SafeZone = (): JSX.Element => { + return ( + + Safe Zone + + + Level 1 + + + + Level 2 + + + + Level 1 + + + + Level 2 + + + + Level 1 + + + + + ); +}; diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx index 1143a0a48..374b6bb59 100644 --- a/packages/client/src/pages/GameBoard.tsx +++ b/packages/client/src/pages/GameBoard.tsx @@ -1,4 +1,24 @@ -import { Grid, GridItem, Heading } from '@chakra-ui/react'; +import { + Box, + Grid, + GridItem, + Heading, + HStack, + Spacer, + VStack, +} from '@chakra-ui/react'; + +import { HealthPotion } from '../components/Stats/HealthPotion'; +import { Inventory } from '../components/Stats/Inventory'; +import { Level } from '../components/Stats/Level'; +import { Money } from '../components/Stats/Money'; +import { Navigation } from '../components/Stats/Navigation'; +import { Socials } from '../components/Stats/Socials'; +import { Stats } from '../components/Stats/Stats'; +import { TopBar } from '../components/Stats/TopBar'; +import { Monsters } from '../components/TileDetails/Monsters'; +import { Players } from '../components/TileDetails/Players'; +import { SafeZone } from '../components/TileDetails/SafeZone'; export const GameBoard = (): JSX.Element => { return ( @@ -20,7 +40,6 @@ export const GameBoard = (): JSX.Element => { StatsPanel { rowSpan={{ base: 4, md: 6 }} rowStart={{ base: 0, md: 0 }} > - TileDetailsPanel + + + + + + + + + Date: Fri, 7 Jun 2024 08:29:19 -0400 Subject: [PATCH 02/16] Fixes --- .../src/components/TileDetails/Monsters.tsx | 12 ++++++------ .../src/components/TileDetails/SafeZone.tsx | 10 +++++----- packages/client/src/pages/GameBoard.tsx | 18 +----------------- 3 files changed, 12 insertions(+), 28 deletions(-) diff --git a/packages/client/src/components/TileDetails/Monsters.tsx b/packages/client/src/components/TileDetails/Monsters.tsx index dd59d7777..9c58b7743 100644 --- a/packages/client/src/components/TileDetails/Monsters.tsx +++ b/packages/client/src/components/TileDetails/Monsters.tsx @@ -7,21 +7,21 @@ export const Monsters = (): JSX.Element => { Kobold - + Level 2 - + Green Slime - + Level 2 - + Cave Bandit - + Level 2 - {' '} + ); diff --git a/packages/client/src/components/TileDetails/SafeZone.tsx b/packages/client/src/components/TileDetails/SafeZone.tsx index b427b5b32..dd4debfbc 100644 --- a/packages/client/src/components/TileDetails/SafeZone.tsx +++ b/packages/client/src/components/TileDetails/SafeZone.tsx @@ -8,23 +8,23 @@ export const SafeZone = (): JSX.Element => { Level 1 - + Level 2 - + Level 1 - + Level 2 - + Level 1 - + diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx index 374b6bb59..6ffc2c190 100644 --- a/packages/client/src/pages/GameBoard.tsx +++ b/packages/client/src/pages/GameBoard.tsx @@ -1,21 +1,5 @@ -import { - Box, - Grid, - GridItem, - Heading, - HStack, - Spacer, - VStack, -} from '@chakra-ui/react'; +import { Box, Grid, GridItem, Heading, HStack, Spacer } from '@chakra-ui/react'; -import { HealthPotion } from '../components/Stats/HealthPotion'; -import { Inventory } from '../components/Stats/Inventory'; -import { Level } from '../components/Stats/Level'; -import { Money } from '../components/Stats/Money'; -import { Navigation } from '../components/Stats/Navigation'; -import { Socials } from '../components/Stats/Socials'; -import { Stats } from '../components/Stats/Stats'; -import { TopBar } from '../components/Stats/TopBar'; import { Monsters } from '../components/TileDetails/Monsters'; import { Players } from '../components/TileDetails/Players'; import { SafeZone } from '../components/TileDetails/SafeZone'; From 029f8f68933cfd157d2a9defa3a3d2ced2fd3023 Mon Sep 17 00:00:00 2001 From: Fluffy9 <29765579+Fluffy9@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:51:27 -0400 Subject: [PATCH 03/16] stats panel ui --- packages/client/src/pages/GameBoard.tsx | 25 +++++++++++++++++++------ 1 file changed, 19 insertions(+), 6 deletions(-) diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx index 6ffc2c190..1af3ab38e 100644 --- a/packages/client/src/pages/GameBoard.tsx +++ b/packages/client/src/pages/GameBoard.tsx @@ -1,8 +1,13 @@ -import { Box, Grid, GridItem, Heading, HStack, Spacer } from '@chakra-ui/react'; +import { Grid, GridItem, Heading, VStack } from '@chakra-ui/react'; -import { Monsters } from '../components/TileDetails/Monsters'; -import { Players } from '../components/TileDetails/Players'; -import { SafeZone } from '../components/TileDetails/SafeZone'; +import { HealthPotion } from '../components/Stats/HealthPotion'; +import { Inventory } from '../components/Stats/Inventory'; +import { Level } from '../components/Stats/Level'; +import { Money } from '../components/Stats/Money'; +import { Navigation } from '../components/Stats/Navigation'; +import { Socials } from '../components/Stats/Socials'; +import { Stats } from '../components/Stats/Stats'; +import { TopBar } from '../components/Stats/TopBar'; export const GameBoard = (): JSX.Element => { return ( @@ -14,14 +19,22 @@ export const GameBoard = (): JSX.Element => { templateRows={{ base: 'repeat(13, 1fr)', md: 'repeat(12, 1fr)' }} > - StatsPanel + + + + + + + + + + Date: Fri, 7 Jun 2024 08:21:06 -0400 Subject: [PATCH 04/16] fixes --- .../client/src/components/Stats/HealthPotion.tsx | 2 +- .../client/src/components/Stats/Inventory.tsx | 10 +++++----- packages/client/src/components/Stats/Level.tsx | 16 ++++++++++++++-- packages/client/src/components/Stats/Money.tsx | 2 +- .../client/src/components/Stats/Navigation.tsx | 2 +- packages/client/src/components/Stats/Socials.tsx | 2 +- packages/client/src/components/Stats/Stats.tsx | 4 ++-- packages/client/src/components/Stats/TopBar.tsx | 2 +- packages/client/src/pages/GameBoard.tsx | 11 +++++++++-- 9 files changed, 35 insertions(+), 16 deletions(-) diff --git a/packages/client/src/components/Stats/HealthPotion.tsx b/packages/client/src/components/Stats/HealthPotion.tsx index ddbd2c0a6..41e9c0016 100644 --- a/packages/client/src/components/Stats/HealthPotion.tsx +++ b/packages/client/src/components/Stats/HealthPotion.tsx @@ -3,7 +3,7 @@ import { Box, Heading, HStack, Spacer, Text } from '@chakra-ui/react'; export const HealthPotion = (): JSX.Element => { return ( - + Health Potion diff --git a/packages/client/src/components/Stats/Inventory.tsx b/packages/client/src/components/Stats/Inventory.tsx index 1f49c5949..437e0e73e 100644 --- a/packages/client/src/components/Stats/Inventory.tsx +++ b/packages/client/src/components/Stats/Inventory.tsx @@ -3,23 +3,23 @@ import { Box, Heading, HStack, Spacer, Text, VStack } from '@chakra-ui/react'; export const Inventory = (): JSX.Element => { return ( - - + + Active Items 1/3 - + Rusty Dagger - + Empty Slot + - + Empty Slot + diff --git a/packages/client/src/components/Stats/Level.tsx b/packages/client/src/components/Stats/Level.tsx index c6683ecab..4d9945845 100644 --- a/packages/client/src/components/Stats/Level.tsx +++ b/packages/client/src/components/Stats/Level.tsx @@ -1,9 +1,21 @@ import { Box, HStack, Progress, Spacer, Text } from '@chakra-ui/react'; export const Level = (): JSX.Element => { + const percent = 50; return ( - - + + + {percent} + + 90 ? 'none' : 'block'} + position="absolute" + right="0%" + top="-20px" + > + 100 + + Level 1 diff --git a/packages/client/src/components/Stats/Money.tsx b/packages/client/src/components/Stats/Money.tsx index 85099483d..44bce0cf6 100644 --- a/packages/client/src/components/Stats/Money.tsx +++ b/packages/client/src/components/Stats/Money.tsx @@ -2,7 +2,7 @@ import { HStack, Spacer, Text } from '@chakra-ui/react'; export const Money = (): JSX.Element => { return ( - + 2,00 $GOLD 190/345 diff --git a/packages/client/src/components/Stats/Navigation.tsx b/packages/client/src/components/Stats/Navigation.tsx index 2ddf8711f..ad73f9115 100644 --- a/packages/client/src/components/Stats/Navigation.tsx +++ b/packages/client/src/components/Stats/Navigation.tsx @@ -4,11 +4,11 @@ export const Navigation = (): JSX.Element => { return ( { - T&C + T&C ); }; diff --git a/packages/client/src/components/Stats/Stats.tsx b/packages/client/src/components/Stats/Stats.tsx index a8ad97452..979b64d45 100644 --- a/packages/client/src/components/Stats/Stats.tsx +++ b/packages/client/src/components/Stats/Stats.tsx @@ -2,11 +2,11 @@ import { Box, Grid, GridItem, Text } from '@chakra-ui/react'; export const Stats = (): JSX.Element => { return ( - + diff --git a/packages/client/src/components/Stats/TopBar.tsx b/packages/client/src/components/Stats/TopBar.tsx index 769150b8b..2bfe9e2e3 100644 --- a/packages/client/src/components/Stats/TopBar.tsx +++ b/packages/client/src/components/Stats/TopBar.tsx @@ -3,7 +3,7 @@ import { IoIosArrowForward } from 'react-icons/io'; export const TopBar = (): JSX.Element => { return ( - + diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx index 1af3ab38e..00bff87c6 100644 --- a/packages/client/src/pages/GameBoard.tsx +++ b/packages/client/src/pages/GameBoard.tsx @@ -1,4 +1,4 @@ -import { Grid, GridItem, Heading, VStack } from '@chakra-ui/react'; +import { Grid, GridItem, Heading, Spacer, VStack } from '@chakra-ui/react'; import { HealthPotion } from '../components/Stats/HealthPotion'; import { Inventory } from '../components/Stats/Inventory'; @@ -25,14 +25,21 @@ export const GameBoard = (): JSX.Element => { padding="5px" rowSpan={{ base: 12, md: 12 }} > - + + + + + + + + From f2a2251e4e5dc485bd0021c400d9fbf13b018e81 Mon Sep 17 00:00:00 2001 From: Fluffy9 <29765579+Fluffy9@users.noreply.github.com> Date: Fri, 7 Jun 2024 08:34:17 -0400 Subject: [PATCH 05/16] forgot some fixes --- .../src/components/Stats/HealthPotion.tsx | 2 +- .../client/src/components/Stats/Inventory.tsx | 8 ++--- .../client/src/components/Stats/Level.tsx | 2 +- .../client/src/components/Stats/Money.tsx | 2 +- .../client/src/components/Stats/Socials.tsx | 4 +-- .../client/src/components/Stats/TopBar.tsx | 2 +- packages/client/src/pages/GameBoard.tsx | 30 +++++++++---------- 7 files changed, 25 insertions(+), 25 deletions(-) diff --git a/packages/client/src/components/Stats/HealthPotion.tsx b/packages/client/src/components/Stats/HealthPotion.tsx index 41e9c0016..ec954eec2 100644 --- a/packages/client/src/components/Stats/HealthPotion.tsx +++ b/packages/client/src/components/Stats/HealthPotion.tsx @@ -5,7 +5,7 @@ export const HealthPotion = (): JSX.Element => { Health Potion - + diff --git a/packages/client/src/components/Stats/Inventory.tsx b/packages/client/src/components/Stats/Inventory.tsx index 437e0e73e..8b8f30c42 100644 --- a/packages/client/src/components/Stats/Inventory.tsx +++ b/packages/client/src/components/Stats/Inventory.tsx @@ -6,22 +6,22 @@ export const Inventory = (): JSX.Element => { Active Items - + 1/3 Rusty Dagger - + Empty Slot - + + Empty Slot - + + diff --git a/packages/client/src/components/Stats/Level.tsx b/packages/client/src/components/Stats/Level.tsx index 4d9945845..2695206e6 100644 --- a/packages/client/src/components/Stats/Level.tsx +++ b/packages/client/src/components/Stats/Level.tsx @@ -18,7 +18,7 @@ export const Level = (): JSX.Element => { Level 1 - + Level 2 diff --git a/packages/client/src/components/Stats/Money.tsx b/packages/client/src/components/Stats/Money.tsx index 44bce0cf6..123aa8cbc 100644 --- a/packages/client/src/components/Stats/Money.tsx +++ b/packages/client/src/components/Stats/Money.tsx @@ -4,7 +4,7 @@ export const Money = (): JSX.Element => { return ( 2,00 $GOLD - + 190/345 ); diff --git a/packages/client/src/components/Stats/Socials.tsx b/packages/client/src/components/Stats/Socials.tsx index 54b6fb35c..cce7d7418 100644 --- a/packages/client/src/components/Stats/Socials.tsx +++ b/packages/client/src/components/Stats/Socials.tsx @@ -7,11 +7,11 @@ export const Socials = (): JSX.Element => { - + - + T&C ); diff --git a/packages/client/src/components/Stats/TopBar.tsx b/packages/client/src/components/Stats/TopBar.tsx index 2bfe9e2e3..5ae28a6c1 100644 --- a/packages/client/src/components/Stats/TopBar.tsx +++ b/packages/client/src/components/Stats/TopBar.tsx @@ -5,7 +5,7 @@ export const TopBar = (): JSX.Element => { return ( - + 0lffaa_08 ※ diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx index 00bff87c6..ec8e4e6ac 100644 --- a/packages/client/src/pages/GameBoard.tsx +++ b/packages/client/src/pages/GameBoard.tsx @@ -26,21 +26,21 @@ export const GameBoard = (): JSX.Element => { rowSpan={{ base: 12, md: 12 }} > - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + Date: Fri, 7 Jun 2024 14:12:43 -0400 Subject: [PATCH 06/16] Spacing and size fixes --- .../client/src/components/Stats/Inventory.tsx | 30 ----------------- .../{Stats => StatsPanel}/HealthPotion.tsx | 4 +-- .../src/components/StatsPanel/Inventory.tsx | 30 +++++++++++++++++ .../{Stats => StatsPanel}/Level.tsx | 16 +++++++--- .../{Stats => StatsPanel}/Money.tsx | 0 .../{Stats => StatsPanel}/Navigation.tsx | 0 .../{Stats => StatsPanel}/Socials.tsx | 4 +-- .../{Stats => StatsPanel}/Stats.tsx | 16 +++++++--- .../{Stats => StatsPanel}/TopBar.tsx | 4 +-- .../src/components/StatsPanel/index.tsx | 32 +++++++++++++++++++ packages/client/src/pages/GameBoard.tsx | 29 ++--------------- packages/client/src/utils/theme.ts | 25 ++++++++------- 12 files changed, 108 insertions(+), 82 deletions(-) delete mode 100644 packages/client/src/components/Stats/Inventory.tsx rename packages/client/src/components/{Stats => StatsPanel}/HealthPotion.tsx (66%) create mode 100644 packages/client/src/components/StatsPanel/Inventory.tsx rename packages/client/src/components/{Stats => StatsPanel}/Level.tsx (69%) rename packages/client/src/components/{Stats => StatsPanel}/Money.tsx (100%) rename packages/client/src/components/{Stats => StatsPanel}/Navigation.tsx (100%) rename packages/client/src/components/{Stats => StatsPanel}/Socials.tsx (85%) rename packages/client/src/components/{Stats => StatsPanel}/Stats.tsx (69%) rename packages/client/src/components/{Stats => StatsPanel}/TopBar.tsx (82%) create mode 100644 packages/client/src/components/StatsPanel/index.tsx diff --git a/packages/client/src/components/Stats/Inventory.tsx b/packages/client/src/components/Stats/Inventory.tsx deleted file mode 100644 index 8b8f30c42..000000000 --- a/packages/client/src/components/Stats/Inventory.tsx +++ /dev/null @@ -1,30 +0,0 @@ -import { Box, Heading, HStack, Spacer, Text, VStack } from '@chakra-ui/react'; - -export const Inventory = (): JSX.Element => { - return ( - - - - Active Items - - 1/3 - - - Rusty Dagger - - - - - Empty Slot - - + - - - Empty Slot - - + - - - - ); -}; diff --git a/packages/client/src/components/Stats/HealthPotion.tsx b/packages/client/src/components/StatsPanel/HealthPotion.tsx similarity index 66% rename from packages/client/src/components/Stats/HealthPotion.tsx rename to packages/client/src/components/StatsPanel/HealthPotion.tsx index ec954eec2..aafaaceae 100644 --- a/packages/client/src/components/Stats/HealthPotion.tsx +++ b/packages/client/src/components/StatsPanel/HealthPotion.tsx @@ -1,10 +1,10 @@ -import { Box, Heading, HStack, Spacer, Text } from '@chakra-ui/react'; +import { Box, HStack, Spacer, Text } from '@chakra-ui/react'; export const HealthPotion = (): JSX.Element => { return ( - Health Potion + Health Potion diff --git a/packages/client/src/components/StatsPanel/Inventory.tsx b/packages/client/src/components/StatsPanel/Inventory.tsx new file mode 100644 index 000000000..f22706ed3 --- /dev/null +++ b/packages/client/src/components/StatsPanel/Inventory.tsx @@ -0,0 +1,30 @@ +import { Box, Button, HStack, Spacer, Text, VStack } from '@chakra-ui/react'; + +export const Inventory = (): JSX.Element => { + return ( + + + + Active Items + + 1/3 + + + Rusty Dagger + + + + + Empty Slot + + + + + Empty Slot + + + + + + ); +}; diff --git a/packages/client/src/components/Stats/Level.tsx b/packages/client/src/components/StatsPanel/Level.tsx similarity index 69% rename from packages/client/src/components/Stats/Level.tsx rename to packages/client/src/components/StatsPanel/Level.tsx index 2695206e6..3cc0e5869 100644 --- a/packages/client/src/components/Stats/Level.tsx +++ b/packages/client/src/components/StatsPanel/Level.tsx @@ -3,23 +3,29 @@ import { Box, HStack, Progress, Spacer, Text } from '@chakra-ui/react'; export const Level = (): JSX.Element => { const percent = 50; return ( - - + + {percent} 90 ? 'none' : 'block'} position="absolute" right="0%" - top="-20px" + top="-10px" > 100 - Level 1 + Level 1 - Level 2 + Level 2 ); diff --git a/packages/client/src/components/Stats/Money.tsx b/packages/client/src/components/StatsPanel/Money.tsx similarity index 100% rename from packages/client/src/components/Stats/Money.tsx rename to packages/client/src/components/StatsPanel/Money.tsx diff --git a/packages/client/src/components/Stats/Navigation.tsx b/packages/client/src/components/StatsPanel/Navigation.tsx similarity index 100% rename from packages/client/src/components/Stats/Navigation.tsx rename to packages/client/src/components/StatsPanel/Navigation.tsx diff --git a/packages/client/src/components/Stats/Socials.tsx b/packages/client/src/components/StatsPanel/Socials.tsx similarity index 85% rename from packages/client/src/components/Stats/Socials.tsx rename to packages/client/src/components/StatsPanel/Socials.tsx index cce7d7418..45c367e62 100644 --- a/packages/client/src/components/Stats/Socials.tsx +++ b/packages/client/src/components/StatsPanel/Socials.tsx @@ -5,11 +5,11 @@ export const Socials = (): JSX.Element => { return ( - + - + T&C diff --git a/packages/client/src/components/Stats/Stats.tsx b/packages/client/src/components/StatsPanel/Stats.tsx similarity index 69% rename from packages/client/src/components/Stats/Stats.tsx rename to packages/client/src/components/StatsPanel/Stats.tsx index 979b64d45..9cf470ce6 100644 --- a/packages/client/src/components/Stats/Stats.tsx +++ b/packages/client/src/components/StatsPanel/Stats.tsx @@ -10,25 +10,33 @@ export const Stats = (): JSX.Element => { width="75%" > - HP + + HP + 1 - STR + + STR + 3 - AGI + + AGI + 4 - INT + + INT + 5 diff --git a/packages/client/src/components/Stats/TopBar.tsx b/packages/client/src/components/StatsPanel/TopBar.tsx similarity index 82% rename from packages/client/src/components/Stats/TopBar.tsx rename to packages/client/src/components/StatsPanel/TopBar.tsx index 5ae28a6c1..3383b1f2e 100644 --- a/packages/client/src/components/Stats/TopBar.tsx +++ b/packages/client/src/components/StatsPanel/TopBar.tsx @@ -5,10 +5,10 @@ export const TopBar = (): JSX.Element => { return ( - + - 0lffaa_08 ※ + 0lffaa_08 ※ diff --git a/packages/client/src/components/StatsPanel/index.tsx b/packages/client/src/components/StatsPanel/index.tsx new file mode 100644 index 000000000..703916484 --- /dev/null +++ b/packages/client/src/components/StatsPanel/index.tsx @@ -0,0 +1,32 @@ +import { Spacer, VStack } from '@chakra-ui/react'; + +import { HealthPotion } from './HealthPotion'; +import { Inventory } from './Inventory'; +import { Level } from './Level'; +import { Money } from './Money'; +import { Navigation } from './Navigation'; +import { Socials } from './Socials'; +import { Stats } from './Stats'; +import { TopBar } from './TopBar'; + +export const StatsPanel = (): JSX.Element => { + return ( + + + + + + + + + + + + + + + + + + ); +}; diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx index ec8e4e6ac..ec4d7a8dd 100644 --- a/packages/client/src/pages/GameBoard.tsx +++ b/packages/client/src/pages/GameBoard.tsx @@ -1,13 +1,6 @@ -import { Grid, GridItem, Heading, Spacer, VStack } from '@chakra-ui/react'; +import { Grid, GridItem, Heading } from '@chakra-ui/react'; -import { HealthPotion } from '../components/Stats/HealthPotion'; -import { Inventory } from '../components/Stats/Inventory'; -import { Level } from '../components/Stats/Level'; -import { Money } from '../components/Stats/Money'; -import { Navigation } from '../components/Stats/Navigation'; -import { Socials } from '../components/Stats/Socials'; -import { Stats } from '../components/Stats/Stats'; -import { TopBar } from '../components/Stats/TopBar'; +import { StatsPanel } from '../components/StatsPanel'; export const GameBoard = (): JSX.Element => { return ( @@ -25,23 +18,7 @@ export const GameBoard = (): JSX.Element => { padding="5px" rowSpan={{ base: 12, md: 12 }} > - - - - - - - - - - - - - - - - - + Date: Fri, 7 Jun 2024 14:13:29 -0400 Subject: [PATCH 07/16] Text to buttons --- .../client/src/components/StatsPanel/Inventory.tsx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/packages/client/src/components/StatsPanel/Inventory.tsx b/packages/client/src/components/StatsPanel/Inventory.tsx index f22706ed3..35dde5512 100644 --- a/packages/client/src/components/StatsPanel/Inventory.tsx +++ b/packages/client/src/components/StatsPanel/Inventory.tsx @@ -12,17 +12,23 @@ export const Inventory = (): JSX.Element => { Rusty Dagger - + Empty Slot - + Empty Slot - + From ee035e9b66674e8ece48ec3be0da99d1d9a613a2 Mon Sep 17 00:00:00 2001 From: Fluffy9 <29765579+Fluffy9@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:47:36 -0400 Subject: [PATCH 08/16] Tile detail UI elements --- packages/client/src/pages/GameBoard.tsx | 22 +++++++++++++++++++++- packages/client/src/utils/theme.ts | 11 ++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx index ec4d7a8dd..17cda1780 100644 --- a/packages/client/src/pages/GameBoard.tsx +++ b/packages/client/src/pages/GameBoard.tsx @@ -1,4 +1,24 @@ -import { Grid, GridItem, Heading } from '@chakra-ui/react'; +import { + Box, + Grid, + GridItem, + Heading, + HStack, + Spacer, + VStack, +} from '@chakra-ui/react'; + +import { HealthPotion } from '../components/Stats/HealthPotion'; +import { Inventory } from '../components/Stats/Inventory'; +import { Level } from '../components/Stats/Level'; +import { Money } from '../components/Stats/Money'; +import { Navigation } from '../components/Stats/Navigation'; +import { Socials } from '../components/Stats/Socials'; +import { Stats } from '../components/Stats/Stats'; +import { TopBar } from '../components/Stats/TopBar'; +import { Monsters } from '../components/TileDetails/Monsters'; +import { Players } from '../components/TileDetails/Players'; +import { SafeZone } from '../components/TileDetails/SafeZone'; import { StatsPanel } from '../components/StatsPanel'; diff --git a/packages/client/src/utils/theme.ts b/packages/client/src/utils/theme.ts index e7dc5b365..65b73daa3 100644 --- a/packages/client/src/utils/theme.ts +++ b/packages/client/src/utils/theme.ts @@ -11,7 +11,16 @@ export const globalStyles = css` font-size: 1rem; } `; - +const Progress = { + baseStyle: { + track: { + borderRadius: 5, + }, + filledTrack: { + bg: 'black', + }, + }, +}; const Button = { baseStyle: { borderRadius: 5, From 9838f9adfa6c90d96ad77190c90fbcd725983bd6 Mon Sep 17 00:00:00 2001 From: Fluffy9 <29765579+Fluffy9@users.noreply.github.com> Date: Fri, 7 Jun 2024 14:12:43 -0400 Subject: [PATCH 09/16] Spacing and size fixes --- packages/client/src/pages/GameBoard.tsx | 23 ++--------------------- packages/client/src/utils/theme.ts | 11 +---------- 2 files changed, 3 insertions(+), 31 deletions(-) diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx index 17cda1780..cceff433f 100644 --- a/packages/client/src/pages/GameBoard.tsx +++ b/packages/client/src/pages/GameBoard.tsx @@ -1,24 +1,4 @@ -import { - Box, - Grid, - GridItem, - Heading, - HStack, - Spacer, - VStack, -} from '@chakra-ui/react'; - -import { HealthPotion } from '../components/Stats/HealthPotion'; -import { Inventory } from '../components/Stats/Inventory'; -import { Level } from '../components/Stats/Level'; -import { Money } from '../components/Stats/Money'; -import { Navigation } from '../components/Stats/Navigation'; -import { Socials } from '../components/Stats/Socials'; -import { Stats } from '../components/Stats/Stats'; -import { TopBar } from '../components/Stats/TopBar'; -import { Monsters } from '../components/TileDetails/Monsters'; -import { Players } from '../components/TileDetails/Players'; -import { SafeZone } from '../components/TileDetails/SafeZone'; +import { Grid, GridItem, Heading } from '@chakra-ui/react'; import { StatsPanel } from '../components/StatsPanel'; @@ -39,6 +19,7 @@ export const GameBoard = (): JSX.Element => { rowSpan={{ base: 12, md: 12 }} > + Date: Thu, 6 Jun 2024 13:47:36 -0400 Subject: [PATCH 10/16] Tile detail UI elements --- packages/client/src/pages/GameBoard.tsx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx index cceff433f..551482c6f 100644 --- a/packages/client/src/pages/GameBoard.tsx +++ b/packages/client/src/pages/GameBoard.tsx @@ -1,6 +1,9 @@ -import { Grid, GridItem, Heading } from '@chakra-ui/react'; +import { Box, Grid, GridItem, Heading, HStack, Spacer } from '@chakra-ui/react'; import { StatsPanel } from '../components/StatsPanel'; +import { Monsters } from '../components/TileDetails/Monsters'; +import { Players } from '../components/TileDetails/Players'; +import { SafeZone } from '../components/TileDetails/SafeZone'; export const GameBoard = (): JSX.Element => { return ( From db7b531955c00fd2da8d4e5522e07b311b5a9c82 Mon Sep 17 00:00:00 2001 From: Fluffy9 <29765579+Fluffy9@users.noreply.github.com> Date: Thu, 6 Jun 2024 13:51:27 -0400 Subject: [PATCH 11/16] stats panel ui --- .../Monsters.tsx | 0 .../Players.tsx | 0 .../SafeZone.tsx | 0 .../src/components/TileDetailsPanel/index.tsx | 19 +++++++++++++++++++ packages/client/src/pages/GameBoard.tsx | 16 +++------------- 5 files changed, 22 insertions(+), 13 deletions(-) rename packages/client/src/components/{TileDetails => TileDetailsPanel}/Monsters.tsx (100%) rename packages/client/src/components/{TileDetails => TileDetailsPanel}/Players.tsx (100%) rename packages/client/src/components/{TileDetails => TileDetailsPanel}/SafeZone.tsx (100%) create mode 100644 packages/client/src/components/TileDetailsPanel/index.tsx diff --git a/packages/client/src/components/TileDetails/Monsters.tsx b/packages/client/src/components/TileDetailsPanel/Monsters.tsx similarity index 100% rename from packages/client/src/components/TileDetails/Monsters.tsx rename to packages/client/src/components/TileDetailsPanel/Monsters.tsx diff --git a/packages/client/src/components/TileDetails/Players.tsx b/packages/client/src/components/TileDetailsPanel/Players.tsx similarity index 100% rename from packages/client/src/components/TileDetails/Players.tsx rename to packages/client/src/components/TileDetailsPanel/Players.tsx diff --git a/packages/client/src/components/TileDetails/SafeZone.tsx b/packages/client/src/components/TileDetailsPanel/SafeZone.tsx similarity index 100% rename from packages/client/src/components/TileDetails/SafeZone.tsx rename to packages/client/src/components/TileDetailsPanel/SafeZone.tsx diff --git a/packages/client/src/components/TileDetailsPanel/index.tsx b/packages/client/src/components/TileDetailsPanel/index.tsx new file mode 100644 index 000000000..260891c12 --- /dev/null +++ b/packages/client/src/components/TileDetailsPanel/index.tsx @@ -0,0 +1,19 @@ +import { Box, HStack, Spacer } from '@chakra-ui/react'; + +import { Monsters } from './Monsters'; +import { Players } from './Players'; +import { SafeZone } from './SafeZone'; + +export const TileDetailsPanel = (): JSX.Element => { + return ( + + + + + + + + + + ); +}; diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx index 551482c6f..363b786b8 100644 --- a/packages/client/src/pages/GameBoard.tsx +++ b/packages/client/src/pages/GameBoard.tsx @@ -1,9 +1,7 @@ -import { Box, Grid, GridItem, Heading, HStack, Spacer } from '@chakra-ui/react'; +import { Grid, GridItem, Heading } from '@chakra-ui/react'; import { StatsPanel } from '../components/StatsPanel'; -import { Monsters } from '../components/TileDetails/Monsters'; -import { Players } from '../components/TileDetails/Players'; -import { SafeZone } from '../components/TileDetails/SafeZone'; +import { TileDetailsPanel } from '../components/TileDetailsPanel'; export const GameBoard = (): JSX.Element => { return ( @@ -32,15 +30,7 @@ export const GameBoard = (): JSX.Element => { rowSpan={{ base: 4, md: 6 }} rowStart={{ base: 0, md: 0 }} > - - - - - - - - - + Date: Thu, 6 Jun 2024 13:47:36 -0400 Subject: [PATCH 12/16] Tile detail UI elements --- packages/client/src/pages/GameBoard.tsx | 22 +++++++++++++++++++++- packages/client/src/utils/theme.ts | 11 ++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx index 363b786b8..41c47a210 100644 --- a/packages/client/src/pages/GameBoard.tsx +++ b/packages/client/src/pages/GameBoard.tsx @@ -1,4 +1,24 @@ -import { Grid, GridItem, Heading } from '@chakra-ui/react'; +import { + Box, + Grid, + GridItem, + Heading, + HStack, + Spacer, + VStack, +} from '@chakra-ui/react'; + +import { HealthPotion } from '../components/Stats/HealthPotion'; +import { Inventory } from '../components/Stats/Inventory'; +import { Level } from '../components/Stats/Level'; +import { Money } from '../components/Stats/Money'; +import { Navigation } from '../components/Stats/Navigation'; +import { Socials } from '../components/Stats/Socials'; +import { Stats } from '../components/Stats/Stats'; +import { TopBar } from '../components/Stats/TopBar'; +import { Monsters } from '../components/TileDetails/Monsters'; +import { Players } from '../components/TileDetails/Players'; +import { SafeZone } from '../components/TileDetails/SafeZone'; import { StatsPanel } from '../components/StatsPanel'; import { TileDetailsPanel } from '../components/TileDetailsPanel'; diff --git a/packages/client/src/utils/theme.ts b/packages/client/src/utils/theme.ts index e7dc5b365..65b73daa3 100644 --- a/packages/client/src/utils/theme.ts +++ b/packages/client/src/utils/theme.ts @@ -11,7 +11,16 @@ export const globalStyles = css` font-size: 1rem; } `; - +const Progress = { + baseStyle: { + track: { + borderRadius: 5, + }, + filledTrack: { + bg: 'black', + }, + }, +}; const Button = { baseStyle: { borderRadius: 5, From 500630dfc7afd63108f316f04182ab6a81c39e00 Mon Sep 17 00:00:00 2001 From: Fluffy9 <29765579+Fluffy9@users.noreply.github.com> Date: Fri, 7 Jun 2024 14:38:32 -0400 Subject: [PATCH 13/16] fixes --- packages/client/src/pages/GameBoard.tsx | 23 +---------------------- packages/client/src/utils/theme.ts | 10 ---------- 2 files changed, 1 insertion(+), 32 deletions(-) diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx index 41c47a210..c5fb2f9dc 100644 --- a/packages/client/src/pages/GameBoard.tsx +++ b/packages/client/src/pages/GameBoard.tsx @@ -1,24 +1,4 @@ -import { - Box, - Grid, - GridItem, - Heading, - HStack, - Spacer, - VStack, -} from '@chakra-ui/react'; - -import { HealthPotion } from '../components/Stats/HealthPotion'; -import { Inventory } from '../components/Stats/Inventory'; -import { Level } from '../components/Stats/Level'; -import { Money } from '../components/Stats/Money'; -import { Navigation } from '../components/Stats/Navigation'; -import { Socials } from '../components/Stats/Socials'; -import { Stats } from '../components/Stats/Stats'; -import { TopBar } from '../components/Stats/TopBar'; -import { Monsters } from '../components/TileDetails/Monsters'; -import { Players } from '../components/TileDetails/Players'; -import { SafeZone } from '../components/TileDetails/SafeZone'; +import { Grid, GridItem, Heading } from '@chakra-ui/react'; import { StatsPanel } from '../components/StatsPanel'; import { TileDetailsPanel } from '../components/TileDetailsPanel'; @@ -40,7 +20,6 @@ export const GameBoard = (): JSX.Element => { rowSpan={{ base: 12, md: 12 }} > - Date: Fri, 7 Jun 2024 17:06:59 -0400 Subject: [PATCH 14/16] fix font weights --- .../components/TileDetailsPanel/Monsters.tsx | 18 ++++++++++-------- .../components/TileDetailsPanel/Players.tsx | 6 ++++-- .../components/TileDetailsPanel/SafeZone.tsx | 14 +++++++------- .../src/components/TileDetailsPanel/index.tsx | 2 +- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/packages/client/src/components/TileDetailsPanel/Monsters.tsx b/packages/client/src/components/TileDetailsPanel/Monsters.tsx index 9c58b7743..c72fd4f9d 100644 --- a/packages/client/src/components/TileDetailsPanel/Monsters.tsx +++ b/packages/client/src/components/TileDetailsPanel/Monsters.tsx @@ -1,26 +1,28 @@ -import { Box, Heading, HStack, Spacer, Text } from '@chakra-ui/react'; +import { Box, HStack, Spacer, Text } from '@chakra-ui/react'; export const Monsters = (): JSX.Element => { return ( - Monsters + + Monsters + - + Kobold - Level 2 + Level 2 - + Green Slime - Level 2 + Level 2 - + Cave Bandit - Level 2 + Level 2 diff --git a/packages/client/src/components/TileDetailsPanel/Players.tsx b/packages/client/src/components/TileDetailsPanel/Players.tsx index 8bab2dd67..0a5c84500 100644 --- a/packages/client/src/components/TileDetailsPanel/Players.tsx +++ b/packages/client/src/components/TileDetailsPanel/Players.tsx @@ -1,9 +1,11 @@ -import { Box, Heading, Text, VStack } from '@chakra-ui/react'; +import { Box, Text, VStack } from '@chakra-ui/react'; export const Players = (): JSX.Element => { return ( - Players + + Players + Mon-o 🧙‍♂️ GUATY 🎭 diff --git a/packages/client/src/components/TileDetailsPanel/SafeZone.tsx b/packages/client/src/components/TileDetailsPanel/SafeZone.tsx index dd4debfbc..d8a166981 100644 --- a/packages/client/src/components/TileDetailsPanel/SafeZone.tsx +++ b/packages/client/src/components/TileDetailsPanel/SafeZone.tsx @@ -1,28 +1,28 @@ -import { Box, Heading, HStack, Text, VStack } from '@chakra-ui/react'; +import { Box, HStack, Text, VStack } from '@chakra-ui/react'; import { IoIosArrowForward } from 'react-icons/io'; export const SafeZone = (): JSX.Element => { return ( - Safe Zone + Safe Zone - + Level 1 - + Level 2 - + Level 1 - + Level 2 - + Level 1 diff --git a/packages/client/src/components/TileDetailsPanel/index.tsx b/packages/client/src/components/TileDetailsPanel/index.tsx index 260891c12..38b5a55a0 100644 --- a/packages/client/src/components/TileDetailsPanel/index.tsx +++ b/packages/client/src/components/TileDetailsPanel/index.tsx @@ -7,7 +7,7 @@ import { SafeZone } from './SafeZone'; export const TileDetailsPanel = (): JSX.Element => { return ( - + From dd70ad8c973b335f0faa7834e16ad0cf811b51cd Mon Sep 17 00:00:00 2001 From: Fluffy9 <29765579+Fluffy9@users.noreply.github.com> Date: Mon, 10 Jun 2024 08:50:46 -0400 Subject: [PATCH 15/16] Addressed fixes --- .../components/TileDetailsPanel/Monsters.tsx | 10 ++++----- .../components/TileDetailsPanel/Players.tsx | 4 ++-- .../components/TileDetailsPanel/SafeZone.tsx | 16 ++++++++------ .../src/components/TileDetailsPanel/index.tsx | 22 +++++++++++++------ packages/client/src/pages/GameBoard.tsx | 1 - packages/client/src/utils/theme.ts | 4 ++++ 6 files changed, 35 insertions(+), 22 deletions(-) diff --git a/packages/client/src/components/TileDetailsPanel/Monsters.tsx b/packages/client/src/components/TileDetailsPanel/Monsters.tsx index c72fd4f9d..e66d7b611 100644 --- a/packages/client/src/components/TileDetailsPanel/Monsters.tsx +++ b/packages/client/src/components/TileDetailsPanel/Monsters.tsx @@ -3,23 +3,23 @@ import { Box, HStack, Spacer, Text } from '@chakra-ui/react'; export const Monsters = (): JSX.Element => { return ( - + Monsters - - + + Kobold Level 2 - + Green Slime Level 2 - + Cave Bandit Level 2 diff --git a/packages/client/src/components/TileDetailsPanel/Players.tsx b/packages/client/src/components/TileDetailsPanel/Players.tsx index 0a5c84500..db3ca4e13 100644 --- a/packages/client/src/components/TileDetailsPanel/Players.tsx +++ b/packages/client/src/components/TileDetailsPanel/Players.tsx @@ -3,10 +3,10 @@ import { Box, Text, VStack } from '@chakra-ui/react'; export const Players = (): JSX.Element => { return ( - + Players - + Mon-o 🧙‍♂️ GUATY 🎭 Wolf R ※ diff --git a/packages/client/src/components/TileDetailsPanel/SafeZone.tsx b/packages/client/src/components/TileDetailsPanel/SafeZone.tsx index d8a166981..dd5269e2e 100644 --- a/packages/client/src/components/TileDetailsPanel/SafeZone.tsx +++ b/packages/client/src/components/TileDetailsPanel/SafeZone.tsx @@ -4,26 +4,28 @@ import { IoIosArrowForward } from 'react-icons/io'; export const SafeZone = (): JSX.Element => { return ( - Safe Zone - + + Safe Zone + + - Level 1 + Level 1 - Level 2 + Level 2 - Level 1 + Level 1 - Level 2 + Level 2 - Level 1 + Level 1 diff --git a/packages/client/src/components/TileDetailsPanel/index.tsx b/packages/client/src/components/TileDetailsPanel/index.tsx index 38b5a55a0..97f3c236f 100644 --- a/packages/client/src/components/TileDetailsPanel/index.tsx +++ b/packages/client/src/components/TileDetailsPanel/index.tsx @@ -1,4 +1,4 @@ -import { Box, HStack, Spacer } from '@chakra-ui/react'; +import { Grid, GridItem } from '@chakra-ui/react'; import { Monsters } from './Monsters'; import { Players } from './Players'; @@ -6,14 +6,22 @@ import { SafeZone } from './SafeZone'; export const TileDetailsPanel = (): JSX.Element => { return ( - - + + - + + - + + - - + + ); }; diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx index c303819ca..c5fb2f9dc 100644 --- a/packages/client/src/pages/GameBoard.tsx +++ b/packages/client/src/pages/GameBoard.tsx @@ -3,7 +3,6 @@ import { Grid, GridItem, Heading } from '@chakra-ui/react'; import { StatsPanel } from '../components/StatsPanel'; import { TileDetailsPanel } from '../components/TileDetailsPanel'; - export const GameBoard = (): JSX.Element => { return ( Date: Mon, 10 Jun 2024 09:17:55 -0600 Subject: [PATCH 16/16] Minor grid tweak --- .../client/src/components/TileDetailsPanel/index.tsx | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/packages/client/src/components/TileDetailsPanel/index.tsx b/packages/client/src/components/TileDetailsPanel/index.tsx index 97f3c236f..c4275cdb5 100644 --- a/packages/client/src/components/TileDetailsPanel/index.tsx +++ b/packages/client/src/components/TileDetailsPanel/index.tsx @@ -6,14 +6,8 @@ import { SafeZone } from './SafeZone'; export const TileDetailsPanel = (): JSX.Element => { return ( - - + +