Board that corresponds to what the api gives us (#4)
Display what the API gives us as the board + pieces. Co-authored-by: David Frymoyer <david.frymoyer@gmail.com> Reviewed-on: #4 Co-authored-by: fry <david.frymoyer@gmail.com> Co-committed-by: fry <david.frymoyer@gmail.com>
This commit is contained in:
parent
74ee26c8d6
commit
209a4f5caf
5
ui/.prettierrc
Normal file
5
ui/.prettierrc
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"tabWidth": 2,
|
||||||
|
"useTabs": false,
|
||||||
|
"semi": true
|
||||||
|
}
|
@ -8,9 +8,11 @@ FROM base as dependencies
|
|||||||
COPY pages /pages
|
COPY pages /pages
|
||||||
COPY public /public
|
COPY public /public
|
||||||
COPY styles /styles
|
COPY styles /styles
|
||||||
|
COPY api /api
|
||||||
COPY components /components
|
COPY components /components
|
||||||
COPY next* /
|
COPY next* /
|
||||||
COPY tsconfig.json /
|
COPY tsconfig.json /
|
||||||
|
COPY types.ts /
|
||||||
|
|
||||||
EXPOSE 3000
|
EXPOSE 3000
|
||||||
RUN npm run build
|
RUN npm run build
|
||||||
|
20
ui/api/game.api.ts
Normal file
20
ui/api/game.api.ts
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
import wretch from "wretch";
|
||||||
|
import { Cell } from "../types";
|
||||||
|
|
||||||
|
const USER_ID_HEADER = "Player-id";
|
||||||
|
|
||||||
|
export const fetchGameState = async (
|
||||||
|
playerId: string,
|
||||||
|
gameId: number
|
||||||
|
): Promise<{ cells: Cell[]; cellWidth: number }> => {
|
||||||
|
const response: { board: Cell[][] } = await wretch(`/api/game/${gameId}`)
|
||||||
|
.headers({
|
||||||
|
[USER_ID_HEADER]: playerId,
|
||||||
|
})
|
||||||
|
.get()
|
||||||
|
.json();
|
||||||
|
return {
|
||||||
|
cells: response.board.flat(),
|
||||||
|
cellWidth: response.board[0].length,
|
||||||
|
};
|
||||||
|
};
|
@ -1,7 +1,25 @@
|
|||||||
import React from 'react'
|
import React from "react";
|
||||||
|
import { Cell } from "../types";
|
||||||
|
import styles from "../styles/board.module.css";
|
||||||
|
|
||||||
const Board = () => (
|
interface BoardProps {
|
||||||
<input/>
|
cells: Cell[];
|
||||||
)
|
cellWidth: number;
|
||||||
|
}
|
||||||
|
|
||||||
export default Board;
|
const Board = (props: BoardProps) => {
|
||||||
|
return (
|
||||||
|
<div
|
||||||
|
className={styles.gridContainer}
|
||||||
|
style={{
|
||||||
|
gridTemplateColumns: `repeat(${props.cellWidth}, 1fr)`,
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
{props.cells.map((cell) => (
|
||||||
|
<div className={styles.gridCell}>{cell.piece}</div>
|
||||||
|
))}
|
||||||
|
</div>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Board;
|
||||||
|
28
ui/components/game.tsx
Normal file
28
ui/components/game.tsx
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
import React, { useState, useEffect } from "react";
|
||||||
|
import { fetchGameState } from "../api/game.api";
|
||||||
|
import { Cell } from "../types";
|
||||||
|
import Board from "./board";
|
||||||
|
|
||||||
|
interface GameProps {
|
||||||
|
gameId: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
const Game = (props: GameProps) => {
|
||||||
|
const [isLoading, setLoading] = useState(false);
|
||||||
|
const [cellWidth, setCellWidth] = useState(4);
|
||||||
|
const [cells, setCells] = useState([] as Cell[]);
|
||||||
|
useEffect(() => {
|
||||||
|
setLoading(true);
|
||||||
|
fetchGameState("red", props.gameId).then(
|
||||||
|
({ cells: cellList, cellWidth: width }) => {
|
||||||
|
setCellWidth(width);
|
||||||
|
setCells(cellList);
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}, [props.gameId]);
|
||||||
|
|
||||||
|
return <Board cellWidth={cellWidth} cells={cells} />;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Game;
|
13
ui/package-lock.json
generated
13
ui/package-lock.json
generated
@ -10,7 +10,8 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "12.1.0",
|
"next": "12.1.0",
|
||||||
"react": "17.0.2",
|
"react": "17.0.2",
|
||||||
"react-dom": "17.0.2"
|
"react-dom": "17.0.2",
|
||||||
|
"wretch": "^1.7.9"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "17.0.21",
|
"@types/node": "17.0.21",
|
||||||
@ -2527,6 +2528,11 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "ISC"
|
"license": "ISC"
|
||||||
},
|
},
|
||||||
|
"node_modules/wretch": {
|
||||||
|
"version": "1.7.9",
|
||||||
|
"resolved": "https://registry.npmjs.org/wretch/-/wretch-1.7.9.tgz",
|
||||||
|
"integrity": "sha512-uUSze1Z72RiQjyoqr7r1KW+05WDNeqqKOeyJDPhw6EVEaOgp9RQNrr8AQt3OF7qylQbh2iVtT9r0nXIHlbJgqQ=="
|
||||||
|
},
|
||||||
"node_modules/yallist": {
|
"node_modules/yallist": {
|
||||||
"version": "4.0.0",
|
"version": "4.0.0",
|
||||||
"dev": true,
|
"dev": true,
|
||||||
@ -4060,6 +4066,11 @@
|
|||||||
"version": "1.0.2",
|
"version": "1.0.2",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"wretch": {
|
||||||
|
"version": "1.7.9",
|
||||||
|
"resolved": "https://registry.npmjs.org/wretch/-/wretch-1.7.9.tgz",
|
||||||
|
"integrity": "sha512-uUSze1Z72RiQjyoqr7r1KW+05WDNeqqKOeyJDPhw6EVEaOgp9RQNrr8AQt3OF7qylQbh2iVtT9r0nXIHlbJgqQ=="
|
||||||
|
},
|
||||||
"yallist": {
|
"yallist": {
|
||||||
"version": "4.0.0",
|
"version": "4.0.0",
|
||||||
"dev": true
|
"dev": true
|
||||||
|
@ -11,7 +11,8 @@
|
|||||||
"dependencies": {
|
"dependencies": {
|
||||||
"next": "12.1.0",
|
"next": "12.1.0",
|
||||||
"react": "17.0.2",
|
"react": "17.0.2",
|
||||||
"react-dom": "17.0.2"
|
"react-dom": "17.0.2",
|
||||||
|
"wretch": "^1.7.9"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@types/node": "17.0.21",
|
"@types/node": "17.0.21",
|
||||||
|
@ -1,19 +1,19 @@
|
|||||||
import type { NextPage } from 'next'
|
import type { NextPage } from "next";
|
||||||
import Head from 'next/head'
|
import Head from "next/head";
|
||||||
import Image from 'next/image'
|
import Image from "next/image";
|
||||||
import Board from '../components/board'
|
import Game from "../components/game";
|
||||||
import styles from '../styles/Home.module.css'
|
import styles from "../styles/BoardPage.module.css";
|
||||||
|
|
||||||
const Home: NextPage = () => (
|
const Home: NextPage = () => (
|
||||||
<>
|
<div className={styles.main}>
|
||||||
<Head>
|
<Head>
|
||||||
<title>Free Go Game</title>
|
<title>Free Go Game</title>
|
||||||
<link rel="icon" href="/favicon.ico" />
|
<link rel="icon" href="/favicon.ico" />
|
||||||
</Head>
|
</Head>
|
||||||
<main>
|
<main>
|
||||||
<Board />
|
<Game gameId={1} />
|
||||||
</main>
|
</main>
|
||||||
</>
|
</div>
|
||||||
)
|
);
|
||||||
|
|
||||||
export default Home
|
export default Home;
|
||||||
|
4
ui/styles/BoardPage.module.css
Normal file
4
ui/styles/BoardPage.module.css
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
.main {
|
||||||
|
max-width: 900px;
|
||||||
|
margin: auto;
|
||||||
|
}
|
8
ui/styles/board.module.css
Normal file
8
ui/styles/board.module.css
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
.gridContainer {
|
||||||
|
display: grid;
|
||||||
|
}
|
||||||
|
|
||||||
|
.gridCell {
|
||||||
|
border: 1px solid black;
|
||||||
|
padding-top: 100%; /* 100% is supposed to be 1:1 aspect ratio but it doesn't look like it */
|
||||||
|
}
|
6
ui/types.ts
Normal file
6
ui/types.ts
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
export interface Cell {
|
||||||
|
piece?: string;
|
||||||
|
terrain: boolean;
|
||||||
|
hidden: boolean;
|
||||||
|
empty: boolean;
|
||||||
|
}
|
Loading…
Reference in New Issue
Block a user