From aed378c0213db55277a9a3ddbc870c41d4b7abdd Mon Sep 17 00:00:00 2001 From: sorrelbri Date: Sun, 21 Jun 2020 15:00:11 -0700 Subject: [PATCH 1/4] stub Kifu component --- packages/play-node-go/src/components/GameUI/Kifu/Kifu.js | 8 ++++++++ .../play-node-go/src/components/GameUI/Kifu/Kifu.scss | 0 2 files changed, 8 insertions(+) create mode 100644 packages/play-node-go/src/components/GameUI/Kifu/Kifu.js create mode 100644 packages/play-node-go/src/components/GameUI/Kifu/Kifu.scss diff --git a/packages/play-node-go/src/components/GameUI/Kifu/Kifu.js b/packages/play-node-go/src/components/GameUI/Kifu/Kifu.js new file mode 100644 index 0000000..d31a361 --- /dev/null +++ b/packages/play-node-go/src/components/GameUI/Kifu/Kifu.js @@ -0,0 +1,8 @@ +import React from "react"; +import "./Kifu.scss"; + +const Kifu = ({ ...props }) => { + return <>; +}; + +export default Kifu; diff --git a/packages/play-node-go/src/components/GameUI/Kifu/Kifu.scss b/packages/play-node-go/src/components/GameUI/Kifu/Kifu.scss new file mode 100644 index 0000000..e69de29 From 8414d13949938efe69dfd4f1c3b9f25b8fa84ed7 Mon Sep 17 00:00:00 2001 From: sorrelbri Date: Sun, 21 Jun 2020 16:02:45 -0700 Subject: [PATCH 2/4] pass Kifu to appropriate PlayerArea --- packages/play-node-go/src/components/GameUI/Kifu/Kifu.js | 6 +++++- .../src/components/GameUI/PlayerArea/PlayerArea.js | 2 ++ packages/play-node-go/src/pages/Game/Game.js | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/play-node-go/src/components/GameUI/Kifu/Kifu.js b/packages/play-node-go/src/components/GameUI/Kifu/Kifu.js index d31a361..8ab6c78 100644 --- a/packages/play-node-go/src/components/GameUI/Kifu/Kifu.js +++ b/packages/play-node-go/src/components/GameUI/Kifu/Kifu.js @@ -2,7 +2,11 @@ import React from "react"; import "./Kifu.scss"; const Kifu = ({ ...props }) => { - return <>; + return ( + <> +

Kifu

+ + ); }; export default Kifu; diff --git a/packages/play-node-go/src/components/GameUI/PlayerArea/PlayerArea.js b/packages/play-node-go/src/components/GameUI/PlayerArea/PlayerArea.js index 10bf38a..88b4ea3 100644 --- a/packages/play-node-go/src/components/GameUI/PlayerArea/PlayerArea.js +++ b/packages/play-node-go/src/components/GameUI/PlayerArea/PlayerArea.js @@ -6,6 +6,7 @@ const PlayerArea = ({ handlePassClick, playerMeta, turn, + Kifu, }) => { const { stones, player, rank, captures } = playerMeta; const isTurn = @@ -32,6 +33,7 @@ const PlayerArea = ({ >

{bowlText()}

+ {Kifu}
diff --git a/packages/play-node-go/src/pages/Game/Game.js b/packages/play-node-go/src/pages/Game/Game.js index a4377b8..39478b4 100644 --- a/packages/play-node-go/src/pages/Game/Game.js +++ b/packages/play-node-go/src/pages/Game/Game.js @@ -5,6 +5,7 @@ import "./Game.scss"; import Logo from "../../components/Display/Logo/Logo"; import Board from "../../components/GameUI/Board/Board"; import PlayerArea from "../../components/GameUI/PlayerArea/PlayerArea"; +import Kifu from "../../components/GameUI/Kifu/Kifu"; const Game = (props) => { const { state, dispatch } = props; @@ -139,6 +140,7 @@ const Game = (props) => { ? playerWhiteMeta : playerBlackMeta } + Kifu={} turn={state?.meta?.turn} />
From 35c51c567f3765f1f105a820b36061cafd464dbf Mon Sep 17 00:00:00 2001 From: sorrelbri Date: Sun, 21 Jun 2020 16:32:24 -0700 Subject: [PATCH 3/4] style kifu --- .../play-node-go/src/components/GameUI/Kifu/Kifu.js | 7 ++++--- .../src/components/GameUI/Kifu/Kifu.scss | 13 +++++++++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/packages/play-node-go/src/components/GameUI/Kifu/Kifu.js b/packages/play-node-go/src/components/GameUI/Kifu/Kifu.js index 8ab6c78..cd91ec9 100644 --- a/packages/play-node-go/src/components/GameUI/Kifu/Kifu.js +++ b/packages/play-node-go/src/components/GameUI/Kifu/Kifu.js @@ -2,10 +2,11 @@ import React from "react"; import "./Kifu.scss"; const Kifu = ({ ...props }) => { + console.log(props); return ( - <> -

Kifu

- +
+
+
); }; diff --git a/packages/play-node-go/src/components/GameUI/Kifu/Kifu.scss b/packages/play-node-go/src/components/GameUI/Kifu/Kifu.scss index e69de29..a529d41 100644 --- a/packages/play-node-go/src/components/GameUI/Kifu/Kifu.scss +++ b/packages/play-node-go/src/components/GameUI/Kifu/Kifu.scss @@ -0,0 +1,13 @@ +div.Kifu { + order: 0; + height: 10vh; + width: 8vh; + background-color: #FFF; + transform: rotate(-20deg); + div.Kifu__board { + border: 0.25vh solid #444; + width: 5vh; + height: 5vh; + margin: 1vh 2vh 2vh auto; + } +} \ No newline at end of file From d803f55f5bfda60c84878180ded4270d305f4214 Mon Sep 17 00:00:00 2001 From: sorrelbri Date: Sun, 21 Jun 2020 16:33:53 -0700 Subject: [PATCH 4/4] remove props from Kifu --- packages/play-node-go/src/components/GameUI/Kifu/Kifu.js | 3 +-- .../src/components/GameUI/PlayerArea/PlayerArea.js | 1 - packages/play-node-go/src/pages/Game/Game.js | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/packages/play-node-go/src/components/GameUI/Kifu/Kifu.js b/packages/play-node-go/src/components/GameUI/Kifu/Kifu.js index cd91ec9..a494739 100644 --- a/packages/play-node-go/src/components/GameUI/Kifu/Kifu.js +++ b/packages/play-node-go/src/components/GameUI/Kifu/Kifu.js @@ -1,8 +1,7 @@ import React from "react"; import "./Kifu.scss"; -const Kifu = ({ ...props }) => { - console.log(props); +const Kifu = () => { return (
diff --git a/packages/play-node-go/src/components/GameUI/PlayerArea/PlayerArea.js b/packages/play-node-go/src/components/GameUI/PlayerArea/PlayerArea.js index 88b4ea3..5ded5d7 100644 --- a/packages/play-node-go/src/components/GameUI/PlayerArea/PlayerArea.js +++ b/packages/play-node-go/src/components/GameUI/PlayerArea/PlayerArea.js @@ -22,7 +22,6 @@ const PlayerArea = ({ const bowlText = () => { if (isTurn) return "Pass?"; if (turn === 0) return "End Game?"; - // return; }; return ( diff --git a/packages/play-node-go/src/pages/Game/Game.js b/packages/play-node-go/src/pages/Game/Game.js index 39478b4..fab84af 100644 --- a/packages/play-node-go/src/pages/Game/Game.js +++ b/packages/play-node-go/src/pages/Game/Game.js @@ -140,7 +140,7 @@ const Game = (props) => { ? playerWhiteMeta : playerBlackMeta } - Kifu={} + Kifu={} turn={state?.meta?.turn} />