Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Refactor socket and components #78

Merged
merged 7 commits into from
Mar 11, 2025
Merged

Refactor socket and components #78

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1b21e82
Refactor socket
davidckim Mar 4, 2025
047dcdc
Refactor socket
davidckim Mar 4, 2025
b881e74
Fix expression issues on debug component
davidckim Mar 11, 2025
bece4b6
Merge branch 'main' into CHIA-refactor-components-sockets
davidckim Mar 11, 2025
44d7cb1
Fix merge conflict
davidckim Mar 11, 2025
441a277
Merge branch 'CHIA-refactor-components-sockets' of github.com:Chia-Ne…
davidckim Mar 11, 2025
13a625c
Add override for typescript dependency
davidckim Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
292 changes: 128 additions & 164 deletions resources/gaming-fe/src/components/Game.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,47 @@
import React, {cloneElement, useState} from "react";
import { Box, Button,
import React, { cloneElement, useState } from "react";
import {
Box,
Button,
ButtonGroup,
Divider,
FormControl,
InputLabel,
Link,
MenuItem,
Select,
SxProps,
Typography, } from "@mui/material";
Typography,
} from "@mui/material";
import useGameSocket from "../hooks/useGameSocket";
import PlayerSection from "./PlayerSection";
import OpponentSection from "./OpponentSection";
import GameLog from "./GameLog";
import WaitingScreen from "./WaitingScreen";
import LobbyScreen from "./LobbyScreen";
import { useWalletConnect } from "../hooks/WalletConnectContext";
import { useRpcUi } from "../hooks/useRpcUi"
//import { useWalletConnectCalls } from "../hooks/useWalletConnect";
import { useRpcUi } from "../hooks/useRpcUi";
import useDebug from "../hooks/useDebug";
import Debug from "./Debug";

// Game is the entry point
const Game: React.FC = () => {


const {client, session, pairings, connect, disconnect } = useWalletConnect();

const { client, session, pairings, connect, disconnect } = useWalletConnect();
const [command, setCommand] = useState(0);
const { commands, responseData } = useRpcUi();
const { commands } = useRpcUi();
const commandEntries = Object.entries(commands);
const selectedCommandEntry = commandEntries[command];

const commandEntry = Object.entries(commands)[command];
{
console.log("WC", client, session, pairings, connect, disconnect);
}
const onConnect = () => {
if (!client) throw new Error('WalletConnect is not initialized.');
console.log("WC", client, session, pairings, connect, disconnect);

const handleConnectWallet = () => {
if (!client) throw new Error("WalletConnect is not initialized.");

if (pairings.length === 1) {
connect({ topic: pairings[0].topic });
connect({ topic: pairings[0].topic });
} else if (pairings.length) {
console.log('The pairing modal is not implemented.', pairings);
console.log("The pairing modal is not implemented.", pairings);
} else {
connect();
connect();
}
};

const onDisconnect = () => { 0; }

const {
gameState,
wagerAmount,
Expand All @@ -66,9 +60,7 @@ const Game: React.FC = () => {
handleEndTurn,
} = useGameSocket();

const {
wcInfo, setWcInfo,
} = useDebug();
const { wcInfo, setWcInfo } = useDebug();

if (gameState === "idle") {
return (
Expand All @@ -78,152 +70,124 @@ const Game: React.FC = () => {
handleFindOpponent={handleFindOpponent}
/>
);
} else if (gameState === "searching") {
}

if (gameState === "searching") {
return <WaitingScreen />;
} else if (gameState === "playing") {
return (
<Box p={4}>
<Typography variant="h4" align="center">
Cal Poker
</Typography>
<br />
<Typography
variant="h6"
align="center"
color={isPlayerTurn ? "success" : "warning"}
>
{isPlayerTurn ? "Your turn" : "Opponent's turn"}
</Typography>
<br />
<Box
display="flex"
flexDirection={{ xs: "column", md: "row" }}
alignItems="stretch"
gap={2}
mb={4}
>
<Box flex={1} display="flex" flexDirection="column">
<PlayerSection
playerNumber={playerNumber}
playerCoins={playerCoins}
wagerAmount={wagerAmount}
playerHand={playerHand}
isPlayerTurn={isPlayerTurn}
handleBet={handleBet}
handleMakeMove={handleMakeMove}
handleEndTurn={handleEndTurn}
/>
</Box>
<Box flex={1} display="flex" flexDirection="column">
<OpponentSection
playerNumber={playerNumber}
opponentCoins={opponentCoins}
opponentWager={opponentWager}
opponentHand={opponentHand}
/>
</Box>
}

return (
<Box p={4}>
<Typography variant="h4" align="center">
Cal Poker
</Typography>
<br />
<Typography
variant="h6"
align="center"
color={isPlayerTurn ? "success" : "warning"}
>
{isPlayerTurn ? "Your turn" : "Opponent's turn"}
</Typography>
<br />
<Box
display="flex"
flexDirection={{ xs: "column", md: "row" }}
alignItems="stretch"
gap={2}
mb={4}
>
<Box flex={1} display="flex" flexDirection="column">
<PlayerSection
playerNumber={playerNumber}
playerCoins={playerCoins}
wagerAmount={wagerAmount}
playerHand={playerHand}
isPlayerTurn={isPlayerTurn}
handleBet={handleBet}
handleMakeMove={handleMakeMove}
handleEndTurn={handleEndTurn}
/>
</Box>
<Box flex={1} display="flex" flexDirection="column">
<OpponentSection
playerNumber={playerNumber}
opponentCoins={opponentCoins}
opponentWager={opponentWager}
opponentHand={opponentHand}
/>
</Box>
<GameLog log={log} />
<Debug connectString={wcInfo} setConnectString={setWcInfo}/>
<Typography variant="h4" align="center">
WC Client state: {/*JSON.stringify(Object.keys(client ? client : {}))*/}
{/* client.protocol version name metadata context */}
{ !client ? "nil" : JSON.stringify(client.context)}
</Typography>
{session ?
</Box>
<GameLog log={log} />
<Debug connectString={wcInfo} setConnectString={setWcInfo} />
<Typography variant="h4" align="center">
WC Client state: {client ? JSON.stringify(client.context) : "nil"}
</Typography>
{session ? (
<>
<FormControl fullWidth sx={{ mt: 2 }}>
<InputLabel id='command-select-label'>
Command
</InputLabel>
<FormControl fullWidth sx={{ mt: 2 }}>
<InputLabel id="command-select-label">Command</InputLabel>
<Select
labelId='command-select-label'
id='command-select-label'
value={command}
label='Command'
onChange={(e) =>
setCommand(e.target.value as number)
}
labelId="command-select-label"
id="command-select"
value={command}
label="Command"
onChange={(e) => setCommand(Number(e.target.value))}
>
{Object.keys(commands).map((name, i) => (
<MenuItem key={i} value={i}>
{name}
</MenuItem>
))}
{commandEntries.map(([name], i) => (
<MenuItem key={i} value={i}>
{name}
</MenuItem>
))}
</Select>
</FormControl>

<Divider sx={{ mt: 4 }} />

<Box mt={3}>
<Typography variant='h5' mb={2}>
<code>{commandEntry[0]}</code>
</FormControl>
<Divider sx={{ mt: 4 }} />
<Box mt={3}>
<Typography variant="h5" mb={2}>
<code>{selectedCommandEntry[0]}</code>
</Typography>

{commandEntry[1].map((element, i) =>
cloneElement(element, { key: i })
{selectedCommandEntry[1].map((element, i) =>
cloneElement(element, { key: i })
)}

<ButtonGroup variant='outlined'>
<Button
fullWidth
variant='outlined'
color='error'
onClick={() => disconnect()}
>
Unlink Wallet
</Button>

<Button
fullWidth
variant='outlined'
color='error'
onClick={() => {
localStorage.clear();
window.location.href = '';
}}
>
Reset Storage
</Button>
<ButtonGroup variant="outlined" fullWidth>
<Button variant="outlined" color="error" onClick={() => disconnect()}>
Unlink Wallet
</Button>
<Button
variant="outlined"
color="error"
onClick={() => {
localStorage.clear();
window.location.href = "";
}}
>
Reset Storage
</Button>
</ButtonGroup>
</Box>

<Divider sx={{ mt: 4 }} />

<Box mt={3}>
<Typography variant='h5'>Response</Typography>



<Button
fullWidth
variant='outlined'
color='error'
onClick={() => {
localStorage.clear();
window.location.href = '';
}}
>
Unlink Wallet
</Button>
</Box>
</>
:

<Button
variant='contained'
onClick={onConnect}
sx={{ mt: 3 }}
>
Link Wallet
</Button>
}
</Box>
);
}

return null;
</Box>
<Divider sx={{ mt: 4 }} />
<Box mt={3}>
<Typography variant="h5">Response</Typography>
<Button
fullWidth
variant="outlined"
color="error"
onClick={() => {
localStorage.clear();
window.location.href = "";
}}
>
Unlink Wallet
</Button>
</Box>
</>
) : (
<Button variant="contained" onClick={handleConnectWallet} sx={{ mt: 3 }}>
Link Wallet
</Button>
)}
</Box>
);
};

export default Game;

Loading
Loading