From 29e7128f5b6fb46060c815217f2c3ee0eaaddefd Mon Sep 17 00:00:00 2001 From: Fluffy9 <29765579+Fluffy9@users.noreply.github.com> Date: Tue, 4 Jun 2024 22:14:39 -0400 Subject: [PATCH 1/3] Layout --- packages/client/src/Routes.tsx | 4 +- packages/client/src/pages/GameBoard.tsx | 94 +++++++++++++++++++++++++ 2 files changed, 97 insertions(+), 1 deletion(-) create mode 100644 packages/client/src/pages/GameBoard.tsx diff --git a/packages/client/src/Routes.tsx b/packages/client/src/Routes.tsx index 1c77d602a..6aaa3f6fc 100644 --- a/packages/client/src/Routes.tsx +++ b/packages/client/src/Routes.tsx @@ -1,6 +1,7 @@ import { Route, Routes } from 'react-router-dom'; import { CharacterCreation } from './pages/CharacterCreation'; +import { GameBoard } from './pages/GameBoard'; import { Welcome } from './pages/Welcome'; import { World } from './pages/World'; @@ -8,8 +9,9 @@ const AppRoutes: React.FC = () => { return ( } /> - } /> } /> + } /> + } /> ); }; diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx new file mode 100644 index 000000000..6ba6ba79d --- /dev/null +++ b/packages/client/src/pages/GameBoard.tsx @@ -0,0 +1,94 @@ +import { Grid, GridItem, Heading } from '@chakra-ui/react'; + +export const GameBoard = (): JSX.Element => { + // Reset showError state when any of the form fields change + + return ( + + + Stats + + + Board + + + Status + + + Grid + + + Compass + + + Chat + + + Tray + + + ); +}; From d9705384a16415ab7fd0335e2c3c630a1d456e6d Mon Sep 17 00:00:00 2001 From: Fluffy9 <29765579+Fluffy9@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:01:38 -0400 Subject: [PATCH 2/3] delete route, rename panels, merge grid and compass, sort props --- packages/client/src/Routes.tsx | 2 - packages/client/src/pages/GameBoard.tsx | 73 +++++++++++-------------- 2 files changed, 31 insertions(+), 44 deletions(-) diff --git a/packages/client/src/Routes.tsx b/packages/client/src/Routes.tsx index 6aaa3f6fc..1d8dcebcf 100644 --- a/packages/client/src/Routes.tsx +++ b/packages/client/src/Routes.tsx @@ -1,7 +1,6 @@ import { Route, Routes } from 'react-router-dom'; import { CharacterCreation } from './pages/CharacterCreation'; -import { GameBoard } from './pages/GameBoard'; import { Welcome } from './pages/Welcome'; import { World } from './pages/World'; @@ -10,7 +9,6 @@ const AppRoutes: React.FC = () => { } /> } /> - } /> } /> ); diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx index 6ba6ba79d..cfba503ea 100644 --- a/packages/client/src/pages/GameBoard.tsx +++ b/packages/client/src/pages/GameBoard.tsx @@ -8,84 +8,73 @@ export const GameBoard = (): JSX.Element => { gap={2} minH="100vh" padding="5px 0" - templateColumns={{ base: 'repeat(8, 1fr)', sm: 'repeat(8, 1fr)' }} - templateRows={{ base: 'repeat(13, 1fr)', sm: 'repeat(12, 1fr)' }} + templateColumns={{ base: 'repeat(8, 1fr)', md: 'repeat(8, 1fr)' }} + templateRows={{ base: 'repeat(13, 1fr)', md: 'repeat(12, 1fr)' }} > - Stats + StatsPanel - Board + TileDetailsPanel - Status + ActionPanel - Grid + MapPanel - Compass - - Chat Tray From b4cf7b817553b5880763212e27806e3d701d5257 Mon Sep 17 00:00:00 2001 From: Fluffy9 <29765579+Fluffy9@users.noreply.github.com> Date: Wed, 5 Jun 2024 13:09:13 -0400 Subject: [PATCH 3/3] Removed the world route, re-added the game-board. Deleted random comment --- packages/client/src/Routes.tsx | 4 ++-- packages/client/src/pages/GameBoard.tsx | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/client/src/Routes.tsx b/packages/client/src/Routes.tsx index 1d8dcebcf..a7e81a2bc 100644 --- a/packages/client/src/Routes.tsx +++ b/packages/client/src/Routes.tsx @@ -1,15 +1,15 @@ import { Route, Routes } from 'react-router-dom'; import { CharacterCreation } from './pages/CharacterCreation'; +import { GameBoard } from './pages/GameBoard'; import { Welcome } from './pages/Welcome'; -import { World } from './pages/World'; const AppRoutes: React.FC = () => { return ( } /> } /> - } /> + } /> ); }; diff --git a/packages/client/src/pages/GameBoard.tsx b/packages/client/src/pages/GameBoard.tsx index cfba503ea..1143a0a48 100644 --- a/packages/client/src/pages/GameBoard.tsx +++ b/packages/client/src/pages/GameBoard.tsx @@ -1,8 +1,6 @@ import { Grid, GridItem, Heading } from '@chakra-ui/react'; export const GameBoard = (): JSX.Element => { - // Reset showError state when any of the form fields change - return (