refacotr(webapp): rearrange game state and moves

ocftw · Jun 29, 2024 · 171883d · 171883d
1 parent c1d0c72
commit 171883d
Show file tree

Hide file tree

Showing 33 changed files with 774 additions and 1,009 deletions.
diff --git a/packages/webapp/src/components/BoardGame.tsx b/packages/webapp/src/components/BoardGame.tsx
@@ -1,11 +1,10 @@
 import { Client, BoardProps } from 'boardgame.io/react';
 import { SocketIO, Local } from 'boardgame.io/multiplayer'
-import { OpenStarTerVillage } from '@/game';
+import game, { GameState } from '@/game';
 import Table from '@/components/Table/Table';
 import Players from '@/components/Players/Players';
 import DevActions from '@/components/DevActions/DevActions';
 import ActionBoard from './ActionBoard/ActionBoard';
-import { GameState } from '@/game/game';
 
 const Board: React.FC<BoardProps<GameState>> = (props) => {
   const { G, ctx, debug } = props;
@@ -23,7 +22,7 @@ const Boardgame: React.FC<{ isLocal: boolean} & React.ComponentProps<ReturnType<
   const multiplayer = isLocal ? Local() : SocketIO({ server: 'localhost:8000' });
 
   const BoardgameComponent = Client({
-    game: OpenStarTerVillage,
+    game,
     board: Board,
     multiplayer,
   })

diff --git a/packages/webapp/src/components/Project/ActiveProject.tsx b/packages/webapp/src/components/Project/ActiveProject.tsx
@@ -1,4 +1,4 @@
-import { Project } from '@/game/table/table';
+import { Project } from '@/game/store/slice/table';
 import {
   Box,
   Table,

diff --git a/packages/webapp/src/components/Table/Table.tsx b/packages/webapp/src/components/Table/Table.tsx
@@ -1,6 +1,6 @@
 import { Box, Grid } from '@mui/material';
 import ActiveProject from '../Project/ActiveProject';
-import { Table as TableState } from '@/game/table/table';
+import { Table as TableState } from '@/game/store/slice/table';
 
 interface Props {
   table: TableState;

diff --git a/packages/webapp/src/game/cards/cards.test.ts b/packages/webapp/src/game/cards/cards.test.ts
diff --git a/packages/webapp/src/game/cards/cards.ts b/packages/webapp/src/game/cards/cards.ts
diff --git a/packages/webapp/src/game/decks/deck.test.ts b/packages/webapp/src/game/decks/deck.test.ts
diff --git a/packages/webapp/src/game/decks/deck.ts b/packages/webapp/src/game/decks/deck.ts
diff --git a/packages/webapp/src/game/decks/decks.ts b/packages/webapp/src/game/decks/decks.ts