.circleci/config.yml

@@ -43,9 +43,8 @@ jobs:
             - node_modules
           key: 
             v1-dependencies-{{ checksum "package-lock.json" }}
-      - run: npm test
+      # - run: npm install react
-      - run: npm install react
+      # - run: npm install react-dom
-      - run: npm install react-dom
       
       # ! temporary fix for deprecated package: minimist
       - run: npm audit --audit-level=moderate

LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 Sorrel
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

README.md

@@ -1,164 +1,16 @@
 # Node Go
 A browser application to play Go in real time.
 
+## Development Demo
 [The project in it's current state](https://play-node-go.herokuapp.com/)  
 [Client only prototype](https://sorrelbri.github.io/browser-go-proto/)
 
-![Screenshot of an in-progress game of Go.](public/game-in-progress.png)
-
-[About Go](#the-game-of-go)  
-[Technical Challenges](#technical-challenges)  
-[Setup For Development](#setup)  
-[Known Bugs](#known-bugs)  
-[Roadmap](#roadmap)  
-[Features](#features)  
-[Tech](#built-with)  
-
----
-## The Game of Go
-Go is a 2 player abstract strategy game of perfect information.
-
-Players take turns placing playing pieces called stones on the intersections of a gridded board. This board is usually a square 19 points across. Stones remain on the points at which they are placed unless they are captured by the opposing player. Capture occurs when a stone or group of stones no longer has any adjascent empty points.
-
-Play ends when both players agree that they have exhausted all advantageous moves. Scoring is determined by counting and comparing the area controlled by either player.
-
-For a more detailed explanation of the rules, please see [my previous illustrated explanation of the game of go](https://github.com/sorrelbri/browser-go-proto#the-game-of-go) or the [American Go Association's Concise Rules of Go.](https://www.usgo.org/aga-concise-rules-go)
-
----
-## Technical Challenges
-### Modeling Game State
-A go board typically consists of 361 points which can exist in a number of states. Points can influence the state of points that are orthogonal neighbors. This relationship can be thought of as an undirected graph, with each point being a vertex typically of degree 4. Special cases include 'edge' points, whose degree is 3 or, in the case of corner points, 2.
-
-Many of the methods that manage the state of the game and of the board, make use of this graph representation. Groups are contiguous points with the same color stone which are important in determining the life or death of stones on the board. When a player makes a move, (provided that move is legal,) the point at which the move is made will utilize a breadth-first graph traversal calling a `joinGroup` method on each point with the same color stone.
-
-Adjacent points without stones are very important to the state of a point as well. These are known as liberties, and so long as a group of stones has at least one point with at least one liberty, that group remains alive and on the board. Therefore, the `joinGroup` method also utilizes a depth first traversal to mark all of the liberties of a group. Both the stones and the liberties of the group are memoized on the Game object.
-
-![Image of Game logic](public/game-logic.png)
-
-### Game Records
-For the moment, game records are modeled as a list where each move has the type `{player: <string: player color>, pos: {x: <integer>, y: <integer>}}`.
-
-The database `move` table contains additional information `number`, `game_record`, and `prior_move` in addition to a foreign key for a `game` row. `number` represents the move number in a game record (for now this corresponds to list position), `game_record` is a boolean representing whether the move was 'official' or is an alternate move used in study, and `prior_move` is a reference to another `move` row allowing for the construction of a tree model for the game (see [Expanding this representation](#expanding-this-representation), below.)
-
-There is a backend service that processes this list of moves into a current board state ([Modeling Game State](#modeling-game-state).) On the frontend, users have the option of expanding a menu to view the move order in the format below.
-
-![Game Record: Black and white 19x19 grid with moves represented as circles filled in with stone color and marked with move number. Below the grid is an overflow area for moves made at previously played points in the format /[new move number and color at old move number and color/]](public/game-record.png)
-
-This is a customary representation of game records printed in Go literature. A frontend service processes the list of moves and plots each move onto a `<canvas>` element drawn to resemble the grid lines on a board, with moves that are placed at prior points plotted on an additional `<canvas>` element below. 
-
-#### Expanding this representation
-This representation will be expanded when support for alternate game paths is added. Alternate game paths will allow users to study completed games by playing out the consequences of moves not in the completed game. This feature will require a tree structure for the game record where moves on the main line are referred with a `main` property on each move node and alternate moves with any number of alternate references.
-
-### Caching multiple in-progress games
-![Image of Game module in context](public/game-module.png)  
-
-### Partitioning Game Rooms
-Finding a game starts with joining a game room.
-![Image of Home Screen with 'main' game room](public/home-screen.png)
-Watch an in progress game, join a game, or study a historic game.
-![Image of Room Screen with multiple games in various states](public/room-screen.png)
-
----
-## Setup
-### Local Repo
-```sh
-$ git clone https://github.com/sorrelbri/node-go.git
-```
-
-### Install Deps
-```sh
-$ npm run bootstrap
-```  
-Runs lerna `bootstrap` command installing dependencies for project, development and package dependencies
-
-### Initialize Database
-#### Download PostgreSQL 
-To verify PostgreSQL installation:  
-```sh
-$ psql -V
-```
-Node Go API was built with version 11.4.
-[See documentation for Postgres download.](https://www.postgresql.org/download/)
-
-#### Create Databases
-```sh
-$ psql
-# psql(11.4)
-```
-```sql
-CREATE DATABASE node-go;
-CREATE DATABASE node-go-test; # testing database
-```
-
-### Configure Environment
-```sh
-$ touch packages/server/.env
-```
-
-```
-# .env
-NODE_ENV=development
-PORT=# set development port for API
-REACT_ADDRESS=http://localhost:3000 # default
-PG_CONNECTION_STRING=postgresql://localhost:5432/node-go
-PG_CONNECTION_STRING_TEST=postgresql://localhost:5432/node-go-test
-JWT_SECRET=# generate a secret key for JWT signing algorithm
-TEST_SECRET=# same as above, for test environment
-SALT_ROUNDS=# set number of salt rounds for bcrypt hashing function
-DOMAIN=localhost
-USER_ONE_PASSWORD=# credentials for testing with 
-USER_ONE_EMAIL=# same as above
-```
-
-### Smoke test
-```sh
-$ lerna run test
-```
-
-### Run Database Migrations
-```sh
-$ cd packages/server; npm run migrate; npm run seed
-```
-
-### Running in development
-```sh
-$ cd packages/server
-$ npm start # or if you have nodemon
-$ nodemon
-```
-```sh
-$ cd packages/play-node-go
-$ npm start
-```
-
----
-## Known Bugs
-- game end logic not implemented on front end yet
-- no authorization for game moves
-- websocket connections may remain open, pooling prevents runaway leaks, but tests may hang
-
----
-## Roadmap 
-### 6/20
-1. Frontend implementation of game end logic
-2. Auth for games
-3. Game request creation
-### 7/20
-1. Generate game records
-2. Implement chat
-3. Implement study mode
-
----
 ## Features
-- [x] Realtime play
+- [ ] Realtime communications
-- [x] Account authentication
-- [ ] Chat
-- [ ] Study mode
 - [ ] Multiple game settings
 - [ ] Customizable board size
-- [ ] Download games in .sgf format
 
----
+
 ## Built with
 - [Express](https://expressjs.com)
 - [React](https://reactjs.org)

deployment.md

@@ -0,0 +1,8 @@
+`hk-api=https://git.heroku.com/node-go-api.git`
+`hk-play=https://git.heroku.com/play-node-go.git`
+
+### Server
+`$ git subtree push --prefix packages/server hk-api master`
+
+### React
+`$ git subtree push --prefix packages/play-node-go hk-play master`

package.json

@@ -3,7 +3,11 @@
   "private": true,
   "scripts": {
     "test": "lerna run test",
-    "bootstrap": "lerna bootstrap --hoist"
+    "bootstrap": "lerna bootstrap"
+  },
+  "dependencies": {
+    "react": "^16.13.1",
+    "react-dom": "^16.13.1"
   },
   "devDependencies": {
     "@babel/preset-flow": "^7.8.3",

packages/play-node-go/package.json

@@ -5,7 +5,7 @@
   "dependencies": {
     "@mars/heroku-js-runtime-env": "^3.0.2",
     "@testing-library/user-event": "^7.1.2",
-    "node-sass": "^4.14.1",
+    "node-sass": "^4.13.0",
     "react": "^16.13.1",
     "react-dom": "^16.13.1",
     "react-router-dom": "^5.1.2",
@@ -15,7 +15,7 @@
   "scripts": {
     "start": "REACT_APP_ENVIRONMENT='development' react-scripts start",
     "build": "react-scripts build",
-    "test": "CI=true react-scripts test",
+    "test": "react-scripts test",
     "eject": "react-scripts eject",
     "flow": "./node_modules/.bin/flow",
     "predeploy": "REACT_APP_ENVIRONMENT=production npm run build",

packages/play-node-go/public/reset.css

@@ -51,8 +51,3 @@ table {
 	border-collapse: collapse;
 	border-spacing: 0;
 }
-
-button {
-  background: none;
-  border: none;
-}

packages/play-node-go/src/App.js

@@ -36,8 +36,6 @@ function App() {
       dispatch({type:'SOCKET', message: 'LAUNCH', body:{nsp:'', dispatch}});
     }
     socketConnect();
-
-    return () => dispatch({type: 'SOCKET', message: 'DISCONNECT', body: {}});
   }, [ state.connect ])
 
   return (

packages/play-node-go/src/components/Button/Guest/Guest.js

@@ -1,34 +0,0 @@
-import React from "react";
-import authServices from "../../../services/authServices";
-
-const Guest = ({ dispatch }) => {
-  const handleClick = async (e) => {
-    e.preventDefault();
-    // dispatch to guest endpoint
-    const guestResponse = await authServices.guestService();
-
-    if (guestResponse.errors) {
-      const authError = guestResponse.errors[0].auth;
-      return dispatch({
-        type: "ERR",
-        message: "AUTH_ERROR",
-        body: { authError },
-      });
-    }
-
-    return dispatch({
-      type: "AUTH",
-      message: "GUEST",
-      body: guestResponse,
-    });
-  };
-  return (
-    <>
-      <button className="nav__section__button" onClick={handleClick}>
-        Continue As Guest
-      </button>
-    </>
-  );
-};
-
-export default Guest;

packages/play-node-go/src/components/Error/ActionError/ActionError.js

@@ -2,7 +2,7 @@ import React from 'react';
 import './ActionError.scss';
 
 const ActionError = (props) => {
-  const errorMessage = props.error || '';
+  const errorMessage = props.error;
   return (
     <span 
       className="error error--action"

packages/play-node-go/src/components/Error/FormError/FormError.test.js

@@ -3,7 +3,7 @@ import { render } from '@testing-library/react';
 import FormError from './FormError';
 
 test('renders FormError without crashing', () => {
-  const { getByTestId } = render(<FormError error={''}/>);
+  const { getByTestId } = render(<FormError />);
   const FormErrorSpan = getByTestId('FormError');
   expect(FormErrorSpan).toBeInTheDocument();
 });

packages/play-node-go/src/components/Form/Auth/Auth.js

@@ -1,49 +1,45 @@
-import React, { useState } from "react";
+import React, { useState } from 'react';
 
-import Login from "../Login/Login";
+import Login from '../Login/Login';
-import Signup from "../Signup/Signup";
+import Signup from '../Signup/Signup';
-import Guest from "../../Button/Guest/Guest";
 
 const Auth = (props) => {
-  const [showForm, setShowForm] = useState("login");
+  const [ showForm, setShowForm ] = useState('login')
   const { state, dispatch } = props;
 
   return (
     <>
       <div 
         className="nav__section nav__section--auth" 
-        onClick={() => {
+        onClick={()=>{setShowForm('login')}}
-          setShowForm("login");
-        }}
       >
-        <p className="nav__section__label">Login</p>
+        <p 
+          className="nav__section__label"
+        >Login</p>
 
-        {showForm === "login" ? (
+        {
-          <Login dispatch={dispatch} state={state} />
+          showForm === 'login' 
-        ) : (
+          ? <Login dispatch={dispatch} state={state}/> 
-          <></>
+          : <></>
-        )}
+        }
       </div>
 
       <div
         className="nav__section nav__section--auth" 
-        onClick={() => {
+        onClick={()=>{setShowForm('signup')}}
-          setShowForm("signup");
-        }}
       >
-        <p className="nav__section__label">Signup</p>
+        <p 
+          className="nav__section__label"
+        >Signup</p>
 
-        {showForm === "signup" ? (
+      {
-          <Signup dispatch={dispatch} state={state} />
+        showForm === 'signup' 
-        ) : (
+        ? <Signup dispatch={dispatch} state={state}/> 
-          <></>
+        : <></>
-        )}
+      }
-      </div>
-      <div className="nav__section nav__section--auth">
-        <Guest dispatch={dispatch} />
       </div>
     </>
   );
-};
+}
 
 export default Auth;

packages/play-node-go/src/components/GameUI/Board/Board.js

@@ -1,74 +1,38 @@
-import React from "react";
+import React from 'react';
-import "./Board.scss";
+import './Board.scss';
-import Point from "../Point/Point";
+import Point from '../Point/Point';
 
 const Board = (props) => {
-  const { game, user, dispatch, board, meta } = props;
+  const { game, user, dispatch, board } = props;
-  const sizeFlag = `Game__board--size-${game.boardSize}`;
+  const sizeFlag = `Game__board--size-${ game.boardSize }`
-  const hoshiPoints = {
-    9: { "3-3": true, "7-7": true, "3-7": true, "7-3": true },
-    13: {
-      "7-7": true,
-      "10-7": true,
-      "7-4": true,
-      "7-10": true,
-      "4-7": true,
-      "4-4": true,
-      "10-10": true,
-      "4-10": true,
-      "10-4": true,
-    },
-    19: {
-      "10-10": true,
-      "16-10": true,
-      "10-4": true,
-      "10-16": true,
-      "4-10": true,
-      "4-4": true,
-      "16-16": true,
-      "4-16": true,
-      "16-4": true,
-    },
-  };
 
-  const isHoshi = (posX, posY) =>
+  const renderPoints = boardSize => {
-    hoshiPoints[game.boardSize][`${posX}-${posY}`];
+    let i = 0, boardPoints = [];
-
-  const renderPoints = (boardSize) => {
-    let i = 0,
-      boardPoints = [];
     while (i < boardSize * boardSize) {
-      const posX = Math.floor(i / boardSize) + 1;
+      const posX = Math.floor(i/boardSize) + 1;
-      const posY = (i % boardSize) + 1;
+      const posY = i % boardSize + 1;
-      const pointData = board[`${posX}-${posY}`];
+      console.log(board[`${posX}-${posY}`])
-      const dotData =
-        meta && meta.turn === 0 && !meta.winner && meta.territory
-          ? meta.territory[`${posX}-${posY}`]
-          : game.turn || meta?.turn;
       boardPoints.push(
         <Point 
           key={`${posX}-${posY}`} 
           posX={posX}
           posY={posY}
-          pointData={pointData}
+          pointData={board[`${posX}-${posY}`]}
-          dotData={dotData}
+          // point={board[posX][posY]}
           dispatch={dispatch}
           user={user}
-          meta={meta}
-          hoshi={isHoshi(posX, posY)}
           {...props}
         />
-      );
+      ); i++;
-      i++;
     }
     return boardPoints;
-  };
+  }
 
   return (  
     <div className={`Game__board ${sizeFlag}`}>
-      {game.id ? renderPoints(game.boardSize) : <></>}
+      { game.id ? renderPoints(game.boardSize) : <></> }
     </div>
   );
-};
+}
 
 export default Board;

packages/play-node-go/src/components/GameUI/Kifu/Kifu.js

@@ -1,15 +0,0 @@
-import React from "react";
-import "./Kifu.scss";
-
-const Kifu = ({ clickKifu }) => {
-  return (
-    <div className="Kifu">
-      <p className="Kifu__show-menu" onClick={clickKifu}>
-        Show Menu?
-      </p>
-      <div className="Kifu__board"></div>
-    </div>
-  );
-};
-
-export default Kifu;

packages/play-node-go/src/components/GameUI/Kifu/Kifu.scss

@@ -1,31 +0,0 @@
-@import '../../../../public/stylesheets/partials/mixins';
-
-div.Kifu {
-  order: 0;
-  height: 10vh;
-  width: 8vh;
-  background-color: #FFF;
-  transform: rotate(-20deg);
-
-  p.Kifu__show-menu {
-    display: none;
-    margin: 3vh auto;
-    position: absolute;
-    transform: rotate(20deg);
-    width: fit-content;
-  }
-  &:hover {
-    p.Kifu__show-menu {
-      @include gameViewLabel;
-      cursor: pointer;
-      display: inline-block;
-    }
-  }
-
-  div.Kifu__board {
-    border: 0.25vh solid #444;
-    width: 5vh;
-    height: 5vh;
-    margin: 1vh 2vh 2vh auto;
-  }
-}

packages/play-node-go/src/components/GameUI/Menu/Menu.js

@@ -1,194 +0,0 @@
-import React, { useEffect, useRef } from "react";
-import "./Menu.scss";
-
-const Menu = ({ showMenu, clickClose, ...props }) => {
-  const { active, meta } = props.state; // active.game.boardSize, meta.gameRecord
-  const boardSize = active.game.boardSize;
-  const handleBackgroundClick = (e) => {
-    if (e.target.className === "Game__Menu-container") clickClose();
-  };
-  const canvasRef = useRef();
-  const overflowRef = useRef();
-  const drawGameRecord = () => {
-    return (
-      <>
-        <canvas ref={canvasRef} />
-        <canvas ref={overflowRef} />
-      </>
-    );
-  };
-
-  const clickPrint = () => {
-    const iframe = document.createElement("iframe");
-    const body = document.getElementsByTagName("body")[0];
-    const record = document.getElementById("record");
-    body.appendChild(iframe);
-    // move game record to iframe and print iframe
-    iframe.contentDocument.body.appendChild(canvasRef.current);
-    iframe.contentDocument.body.appendChild(overflowRef.current);
-    iframe.contentWindow.print();
-    // move game record back to menu and remove iframe
-    record.appendChild(canvasRef.current);
-    record.appendChild(overflowRef.current);
-    body.removeChild(iframe);
-  };
-
-  // draw canvases
-  useEffect(() => {
-    const canvas = canvasRef.current;
-    const ctx = canvas.getContext("2d");
-    const scale = Math.min(window.innerWidth * 0.75, 500);
-    canvas.height = scale;
-    canvas.width = scale;
-    const space = scale / boardSize;
-    const offset = space / 2;
-    for (let i = 0; i < boardSize; i++) {
-      const start = i * space + offset;
-      const end = scale - offset;
-      ctx.beginPath();
-      ctx.moveTo(start, offset);
-      ctx.lineTo(start, end);
-      ctx.closePath();
-      ctx.stroke();
-      ctx.beginPath();
-      ctx.moveTo(offset, start);
-      ctx.lineTo(end, start);
-      ctx.closePath();
-      ctx.stroke();
-    }
-    if (!meta?.gameRecord) return;
-    ctx.textAlign = "center";
-    ctx.textBaseline = "middle";
-    const { overflow } = meta.gameRecord.reduce(
-      (dict, { player, pos }, index) => {
-        const past = dict[`${pos.x}-${pos.y}`];
-        if (past) {
-          // overflow: [ { move:#, player:'color', subsequentMoves: [ { move: #, player: 'color' } ] } ]
-          if (dict.overflow) {
-            const indexOfPrior = dict.overflow.findIndex(
-              ({ move }) => move === past
-            );
-            if (indexOfPrior !== -1) {
-              // if multiple past moves at this point exist
-              dict.overflow[indexOfPrior].subsequentMoves.push({
-                move: index + 1,
-                player,
-              });
-              return dict;
-            }
-            // if a second move at this point has not yet been encountered
-            // prior move will be black if no active handicap and move is odd or if active handicap and move is even
-            const playerPrior =
-              (active.handicap && !(past % 2)) || past % 2 ? "black" : "white";
-            return {
-              ...dict,
-              overflow: [
-                ...dict.overflow,
-                {
-                  move: past,
-                  player: playerPrior,
-                  subsequentMoves: [{ move: index + 1, player }],
-                },
-              ],
-            };
-          }
-          // if no move has yet been encountered at a previously made move
-          return {
-            ...dict,
-            overflow: [
-              { move: past, subsequentMoves: [{ move: index + 1, player }] },
-            ],
-          };
-        }
-        ctx.beginPath();
-        ctx.arc(
-          (pos.y - 1) * space + offset,
-          (pos.x - 1) * space + offset,
-          offset * 0.95,
-          0,
-          Math.PI * 2,
-          true
-        );
-        ctx.stroke();
-        ctx.fillStyle = player === "white" ? "#fff" : "#000";
-        ctx.fill();
-        ctx.fillStyle = player === "white" ? "#000" : "#fff";
-
-        ctx.fillText(
-          index + 1,
-          (pos.y - 1) * space + offset,
-          (pos.x - 1) * space + offset
-        );
-        return { ...dict, [`${pos.x}-${pos.y}`]: index + 1 };
-      },
-      {}
-    );
-    if (!overflow?.length) return;
-    // Draw Overflow Moves (moves made at prior points)
-    const canvas2 = overflowRef.current;
-    const ctx2 = canvas2.getContext("2d");
-    canvas2.width = scale;
-    canvas2.height = space * overflow.length;
-    ctx2.textAlign = "center";
-    ctx2.textBaseline = "middle";
-    overflow.forEach(({ move, subsequentMoves, player }, index) => {
-      subsequentMoves.forEach(({ player, move }, subIndex) => {
-        ctx2.beginPath();
-        ctx2.arc(
-          subIndex * space + offset,
-          index * space + offset,
-          offset * 0.95,
-          0,
-          Math.PI * 2,
-          true
-        );
-        ctx2.stroke();
-        ctx2.fillStyle = player === "white" ? "#fff" : "#000";
-        ctx2.fill();
-        ctx2.fillStyle = player === "white" ? "#000" : "#fff";
-        ctx2.fillText(move, subIndex * space + offset, index * space + offset);
-      });
-      ctx2.fillStyle = "#000";
-      ctx2.fillText(
-        "at",
-        subsequentMoves.length * space + offset,
-        index * space + offset
-      );
-      ctx2.fillStyle = player === "white" ? "#fff" : "#000";
-      ctx2.beginPath();
-      ctx2.arc(
-        (subsequentMoves.length + 1) * space + offset,
-        index * space + offset,
-        offset * 0.95,
-        0,
-        Math.PI * 2,
-        true
-      );
-      ctx2.fill();
-      ctx2.stroke();
-      ctx2.fillStyle = player === "white" ? "#000" : "#fff";
-      ctx2.fillText(
-        move,
-        (subsequentMoves.length + 1) * space + offset,
-        index * space + offset
-      );
-    });
-  }, [showMenu, meta, active.handicap, boardSize]);
-
-  return (
-    <div
-      className={`Game__Menu-container${showMenu ? "" : "--hidden"}`}
-      onClick={(e) => handleBackgroundClick(e)}
-    >
-      <div className="Game__Menu-container__Menu">
-        <button onClick={clickClose}>X</button>
-        <button onClick={clickPrint}>Print Record</button>
-        <div id="record" className="Game__Menu__game-record-container">
-          {drawGameRecord()}
-        </div>
-      </div>
-    </div>
-  );
-};
-
-export default Menu;

packages/play-node-go/src/components/GameUI/Menu/Menu.scss

@@ -1,29 +0,0 @@
-div.Game__Menu-container {
-  &--hidden {
-    display: none;  
-  }
-
-  background: rgba(0,0,0,0.5);
-  display: flex;
-  flex-flow: column nowrap;
-  justify-content: center;
-  align-items: center;
-  height: 100vh;
-  position: absolute;
-  width: 100vw;
-  z-index: 2;
-  
-  .Game__Menu-container__Menu {
-    background: #eef;
-    max-height: 90vh;
-    max-width: 80vw;
-    padding: 2vh;
-    overflow: scroll;
-  }
-
-  div.Game__Menu__game-record-container {
-    display: flex;
-    flex-flow: column nowrap;
-    align-items: center;
-  }
-}

packages/play-node-go/src/components/GameUI/PlayerArea/PlayerArea.js

@@ -1,66 +1,45 @@
-import React from "react";
+import React from 'react';
-import "./PlayerArea.scss";
+import './PlayerArea.scss';
 
-const PlayerArea = ({
+const PlayerArea = (props) => {
-  handleResignClick,
+  // const { user } = props
-  handlePassClick,
+  const user = {
-  playerMeta,
+    stones: 'black',
-  turn,
+    username: 'Name',
-  Kifu,
+    captures: 0
-}) => {
+  }
-  const { stones, player, rank, captures } = playerMeta;
-  const isTurn =
-    (stones === "black" && turn === 1) || (stones === "white" && turn === -1);
-  const bowlAttributes = () => {
-    if (isTurn || turn === 0)
-      return {
-        "data-turn": true,
-        onClick: () => handlePassClick(stones),
-      };
-    return null;
-  };
-  const bowlText = () => {
-    if (isTurn) return "Pass?";
-    if (turn === 0) return "End Game?";
-  };
 
   return (
-    <div className={`player-container player-container--${stones}`}>
+    <div
+      className={`player-container player-container--${user.stones}`}
+    >
       <div 
-        className={`player-container__bowl player-container__bowl--${stones}`}
+        className={`player-container__bowl player-container__bowl--${user.stones}`}
-        {...bowlAttributes()}
       >
-        <p>{bowlText()}</p>
+        <p>Pass?</p>
       </div>
-      {Kifu}
       <div
-        className={`player-container__name-space player-container__name-space--${stones}`}
+        className={`player-container__name-space player-container__name-space--${user.stones}`}
       >
-        <h4>
+        <h4>{user ? user.username : 'Waiting for player' }</h4>
-          {playerMeta
-            ? `${player || stones} ${rank || "?"}`
-            : "Waiting for player"}
-        </h4>
 
         <div
-          className={`player-container__caps-space player-container__caps-space__${stones}`}
+          className={`player-container__caps-space player-container__caps-space__${user.stones}`}
         >
           <p
-            className={`player-container__resign-message player-container__resign-message--${stones}`}
+            className={`player-container__resign-message player-container__resign-message--${user.stones}`}
-            {...(isTurn ? { onClick: () => handleResignClick(stones) } : null)}
+          >Resign?</p>
-          >
-            Resign?
-          </p>
 
           <p 
-            className={`player-container__caps-counter player-container__caps-counter--${stones}`}
+            className={`player-container__caps-counter player-container__caps-counter--${user.stones}`}
-          >
+          >{user ? user.captures : 'Captures go here'}</p>
-            {playerMeta ? captures : "Captures go here"}
+
-          </p>
         </div>
+
       </div>
+
     </div>
   );
-};
+}
 
 export default PlayerArea;

packages/play-node-go/src/components/GameUI/PlayerArea/PlayerArea.scss

@@ -47,7 +47,6 @@ div.player-container {
       padding: .5em;
     }
     &[data-turn] {
-      // highlight for turn
       box-shadow: 0 0 3vh 3vh rgb(255, 175, 2);
         
       & + .player-container__name-space .player-container__caps-space:hover :first-child {

packages/play-node-go/src/components/GameUI/Point/Point.js

@@ -1,96 +1,58 @@
-import React from "react";
+import React from 'react';
-import "./Point.scss";
+import './Point.scss';
 
 const Point = (props) => {
-  const {
+  const { posX, posY, user, game, dispatch, pointData } = props;
-    posX,
+  const turn = game.turn > 0 ? 'black' : 'white';
-    posY,
-    user,
-    game,
-    meta,
-    dispatch,
-    pointData,
-    dotData,
-    hoshi,
-  } = props;
-  const turn =
-    meta && meta.turn
-      ? meta.turn > 0
-        ? "black"
-        : "white"
-      : game.turn > 0
-      ? "black"
-      : "white";
   
   const stone = () => {
-    if (pointData === 1) return "black";
+    if (pointData === 1) return 'black'
-    if (pointData === -1) return "white";
+    if (pointData === -1) return 'white'
-    if (pointData === "k") return "ko";
+    return 'none'
-    return "none";
+  }
-  };
+
+  const dot = () => {
+    if (pointData === 'l') return game.turn;
+  }
 
   const xFlag = () => {
-    if (posX === 1) return `board__point--top`;
+    if ( posX === 1 ) return `board__point--top`
-    if (posX === game.boardSize) return `board__point--bottom`;
+    if ( posX === game.boardSize ) return `board__point--bottom`
-    return "";
+    return '';
-  };
+  }
   const yFlag = () => {
-    if (posY === 1) return `board__point--left`;
+    if ( posY === 1 ) return `board__point--left`
-    if (posY === game.boardSize) return `board__point--right`;
+    if ( posY === game.boardSize ) return `board__point--right`
-    return "";
+    return '';
-  };
+  }
   const clickHandle = (e) => {
-    if (meta?.turn === 0 && !meta?.winner) {
-      const action = {
-        type: "SOCKET",
-        message: "TOGGLE_TERRITORY",
-        body: { user, point: `${posX}-${posY}`, game, room: game.room },
-      };
-      return dispatch(action);
-    }
     const action = {
-      type: "SOCKET",
+      type: 'SOCKET',
-      message: "MAKE_MOVE",
+      message: 'MAKE_MOVE',
       body: {
         user,
         game,
         room: game.room,
         board: {},
-        move: { player: turn, pos: { x: posX, y: posY } },
+        move: { player: turn, pos: { x: posX, y: posY } }
-      },
-    };
-    dispatch(action);
-  };
-
-  const getDot = () => {
-    if (meta?.turn === 0) {
-      switch (dotData) {
-        case -1:
-          return "white";
-        case 1:
-          return "black";
-        case "d":
-          return "dame";
-        default:
-          return 0;
       }
     }
-    return dotData;
+    dispatch(action);
-  };
+  }
 
   return (
     <div 
       className={`board__point ${xFlag()} ${yFlag()}`}
-      onClick={(e) => clickHandle(e)}
+      onClick={e => clickHandle(e)}
     >
-      <div
+      <div className="board__point__stone" 
-        className={`board__point__stone ${hoshi ? "hoshi" : ""}`}
         data-stone={stone()}
       >
-        <div className="board__point__dot" data-dot={getDot()}></div>
+        <div className="board__point__dot" data-dot={dot()}></div>
       </div>
+
     </div>
   );
-};
+}
 
 export default Point;

packages/play-node-go/src/components/GameUI/Point/Point.scss

@@ -5,9 +5,6 @@ div.board__point {
   margin: auto;
   padding: 0;
   vertical-align: middle;
-  display: flex;
-  justify-content: center;
-  align-items: center;
 }
 
 div.board__point--top {
@@ -46,14 +43,11 @@ div.board__point__stone {
   width: 85%;
   height: 85%;
   border-radius: 50%;
+  margin: auto;
   vertical-align: middle;
   display: flex;
   flex-direction: column;
   justify-content: center;
-  &.hoshi {
-    background: radial-gradient(circle farthest-corner at center, #000 0%, #000 14%, rgba(0,0,0,0) 15%);
-    z-index: 3;
-  }
 }
 
 div.board__point div.board__point__stone div.board__point__dot {
@@ -64,44 +58,13 @@ div.board__point div.board__point__stone div.board__point__dot {
   vertical-align: middle;
 }
 
-div.board__point__stone{
+div.board__point__stone[data-stone="white"] {
-  &[data-stone="white"] {
+  background: radial-gradient(farthest-side at 55% 40%, white 0%, rgb(200,200,200) 65%, rgb(100,100,100) 90%, rgb(68, 50, 0) 100%);
-    background: radial-gradient(farthest-side at 55% 40%, white 0%, rgb(200,200,200) 65%, rgb(100,100,100) 90%, rgb(68, 50, 0) 100%);
+  box-shadow: -.25vmin .5vmin .5vmin rgba(145, 92, 23, 0.5);
-    box-shadow: -.25vmin .5vmin .5vmin rgba(145, 92, 23, 0.5);
-  }
-
-  &[data-stone="black"] {
-    background-color: black;
-    background: radial-gradient(farthest-side at 55% 40%, rgb(220,220,220) 0%, rgb(60,60,60) 45%, rgb(15,15,15) 90%, rgb(5, 5, 0) 100%);
-    box-shadow: -.25vmin .5vmin .5vmin rgba(145, 92, 23, 0.75);
-  }
-
-  &[data-stone="ko"] {
-    background-color: transparent;
-    border: .5vmin solid rgba(200,20,50,0.8);
-    border-radius: 0%;
-    height: 60%;
-    width: 60%;
-  }
 }
 
-div.board__point {
+div.board__point__stone[data-stone="black"] {
-  div.board__point__dot[data-dot="dame"] {
+  background-color: black;
-    background: purple;
+  background: radial-gradient(farthest-side at 55% 40%, rgb(220,220,220) 0%, rgb(60,60,60) 45%, rgb(15,15,15) 90%, rgb(5, 5, 0) 100%);
-  }
+  box-shadow: -.25vmin .5vmin .5vmin rgba(145, 92, 23, 0.75);
-  div.board__point__dot[data-dot="black"] {
-    background: black;
-  }
-  div.board__point__dot[data-dot="white"] {
-    background: white;
-  }
-
-  &:hover {
-    div.board__point__dot[data-dot="1"] {
-      background: black;
-    }
-    div.board__point__dot[data-dot="-1"] {
-      background: white;
-    }
-  }
 }

packages/play-node-go/src/io.js

@@ -1,56 +1,43 @@
-import socketIOClient from "socket.io-client";
+import socketIOClient from 'socket.io-client';
-import config from "./config";
+import config from './config';
 
 const launch = (nsp, dispatch) => {
   const socket = socketIOClient(`${config.socketAddress}/${nsp}`);
   
-  socket.on("connected", () => {
+  socket.on('connected', () => {
-    dispatch({
+    dispatch({ type:'SOCKET', message:'CONNECTED', body:{nsp: socket.nsp} });
-      type: "SOCKET",
-      message: "CONNECTED",
-      body: { nsp: socket.nsp },
-    });
   });
-  socket.on("connect_error", (err) => {
+  socket.on('connect_error', err => {
-    dispatch({
+    dispatch({ type: 'ERR', message:'SOCKET_ERROR', body: { socketError: err }});
-      type: "ERR",
-      message: "SOCKET_ERROR",
-      body: { socketError: err },
-    });
   });
-  socket.on("error", (err) => {
+  socket.on('error', err => {
-    dispatch({
+    dispatch({ type: 'ERR', message:'SOCKET_ERROR', body: { socketError: err } });
-      type: "ERR",
-      message: "SOCKET_ERROR",
-      body: { socketError: err },
-    });
   });
   
-  socket.on("room_connected", (data) => {
+  socket.on('room_connected', (data) => {
-    dispatch({ type: "ROOMS", message: "CONNECT_ROOM", body: data });
+    dispatch({ type: 'ROOMS', message: 'CONNECT_ROOM', body: data });
   });
   
-  socket.on("new_user", (data) => {
+  socket.on('new_user', (data) => {
-    dispatch({ type: "ROOMS", message: "NEW_USER", body: data });
+    console.log('new_user received')
-  });
+    dispatch({ type: 'ROOMS', message: 'NEW_USER', body: data })
+  })
 
-  socket.on("game_connected", (data) => {
+  socket.on('game_connected', (data) => {
-    dispatch({ type: "GAMES", message: "UPDATE_BOARD", body: data });
+    console.log(data)
-  });
+    console.log('game_connected received')
+    dispatch({ type: 'GAMES', message: 'UPDATE_BOARD', body: data })
+  })
   
-  socket.on("update_board", (data) => {
+  socket.on('update_board', (data) => {
-    dispatch({ type: "GAMES", message: "UPDATE_BOARD", body: data });
+    console.log(data)
-  });
+    console.log('update_board received')
-
+    dispatch({ type: 'GAMES', message: 'UPDATE_BOARD', body: data.board })
-  socket.on("game_resign", (data) => {
+  })
-    dispatch({ type: "GAMES", message: "GAME_RESIGN", body: data });
-  });
-
-  socket.on("end_game", (data) => {
-    dispatch({ type: "GAMES", message: "GAME_END", body: data });
-  });
 
   return socket;
-};
+}
 
-export { launch };
+export {
+  launch
+}

packages/play-node-go/src/logo.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3">
+    <g fill="#61DAFB">
+        <path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/>
+        <circle cx="420.9" cy="296.5" r="45.7"/>
+        <path d="M520.5 78.1z"/>
+    </g>
+</svg>

packages/play-node-go/src/pages/Game/Game.js

@@ -1,155 +1,70 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect } from 'react';
-import { useParams } from "react-router-dom";
+import { useParams } from 'react-router-dom';
-import gamesServices from "../../services/api/gamesServices";
+import gamesServices from '../../services/api/gamesServices';
-import "./Game.scss";
+import './Game.scss';
-import Logo from "../../components/Display/Logo/Logo";
+import Logo from '../../components/Display/Logo/Logo';
-import Board from "../../components/GameUI/Board/Board";
+import Board from '../../components/GameUI/Board/Board';
-import PlayerArea from "../../components/GameUI/PlayerArea/PlayerArea";
+import PlayerArea from '../../components/GameUI/PlayerArea/PlayerArea';
-import Kifu from "../../components/GameUI/Kifu/Kifu";
-import Menu from "../../components/GameUI/Menu/Menu";
 
 const Game = (props) => {
   const { state, dispatch } = props;
   const gameId = parseInt(useParams().id) || 0;
-  const [playerBlackMeta, setPlayerBlackMeta] = useState({});
+
-  const [playerWhiteMeta, setPlayerWhiteMeta] = useState({});
-  const [showMenu, setShowMenu] = useState(false);
-  const playerState = state?.meta?.playerState;
-  const game = state.active?.game;
   
   useEffect(() => {
     const fetchGameAPI = async () => {
       const response = await gamesServices.getGameService(gameId);
       if (response) {
         const action = {
-          type: "GAMES",
+          type: 'GAMES',
-          message: "SET_ACTIVE",
+          message: 'SET_ACTIVE',
-          body: response,
+          body: response
-        };
+        }
         return dispatch(action);
       }
-    };
+    }
     fetchGameAPI();
-  }, [gameId, dispatch]);
+  }, [ gameId, dispatch ])
+
   
   useEffect(() => {
     const roomSocketConnect = () => {
       const game = state.active.game;
       const user = state.user;
       const action = {
-        type: "SOCKET",
+        type: 'SOCKET',
-        message: "CONNECT_GAME",
+        message: 'CONNECT_GAME',
-        body: { game, user, dispatch },
+        body: { game, user, dispatch }
-      };
+      }
-      return dispatch(action);
-    };
-    roomSocketConnect();
-  }, [state.active.game, dispatch, state.user]);
-
-  useEffect(() => {
-    if (!game || !playerState) return;
-    const { playerBlack, playerBlackRank, playerWhite, playerWhiteRank } = game;
-    const { bCaptures, wCaptures } = playerState;
-    setPlayerBlackMeta({
-      player: playerBlack,
-      rank: playerBlackRank,
-      captures: bCaptures,
-      stones: "black",
-    });
-    setPlayerWhiteMeta({
-      player: playerWhite,
-      rank: playerWhiteRank,
-      captures: wCaptures,
-      stones: "white",
-    });
-  }, [playerState, game]);
-
-  const handleResignClick = (player) => {
-    const action = {
-      type: "SOCKET",
-      message: "RESIGN",
-      body: { game, player },
-    };
-    dispatch(action);
-  };
-
-  const handlePassClick = (player) => {
-    if (state?.meta && state?.meta?.winner) return;
-    if (state?.meta && state?.meta?.turn === 0) {
-      const action = {
-        type: "SOCKET",
-        message: "END_GAME",
-        body: { game, player },
-      };
       return dispatch(action);
     }
-    const action = {
+    roomSocketConnect();
-      type: "SOCKET",
+  }, [ state.active , dispatch, state.user ] )
-      message: "PASS",
-      body: { game, player },
-    };
-    dispatch(action);
-  };
 
   return (  
-    <div className="Game" data-testid="Game">
+    <div 
-      <Menu
+      className="Game" 
-        showMenu={showMenu}
+      data-testid="Game"
-        clickClose={() => setShowMenu(false)}
+    >
-        {...props}
-      />
       <div className="Game__meta-container">
-        <span className="Game__socket-flag">{state.socket ? "✓" : " ⃠"}</span>
+        <span 
+          className="Game__socket-flag"
+        >{state.socket ? '✓' : ' ⃠'}</span>
         <Logo />
-        {state?.meta?.winner ? (
-          <p>
-            {`winner: ${
-              state.meta.winner === 1
-                ? playerBlackMeta?.player
-                : playerWhiteMeta?.player
-            }
-            `}
-          </p>
-        ) : (
-          <></>
-        )}
         <p>Timer</p>
         <p>? Game Tree</p>
       </div>
 
       <div className="Game__board-container">
-        <PlayerArea
+        <PlayerArea />
-          handleResignClick={handleResignClick}
-          handlePassClick={handlePassClick}
-          playerMeta={
-            state.user &&
-            playerBlackMeta.playerBlack &&
-            state.user === playerBlackMeta.playerBlack
-              ? playerBlackMeta
-              : playerWhiteMeta
-          }
-          turn={state?.meta?.turn}
-        />
         <Board 
           dispatch={dispatch}
           game={state.active.game} 
-          meta={state.meta}
+          record={state.active.record}
           user={state.user}
           board={state.board}
         />
-        <PlayerArea
+        <PlayerArea />
-          handleResignClick={handleResignClick}
-          handlePassClick={handlePassClick}
-          playerMeta={
-            state.user &&
-            playerBlackMeta.playerWhite &&
-            state.user === playerWhiteMeta.playerWhite
-              ? playerWhiteMeta
-              : playerBlackMeta
-          }
-          Kifu={<Kifu clickKifu={() => setShowMenu(true)} />}
-          turn={state?.meta?.turn}
-        />
       </div>
 
       <div className="Game__message-container">
@@ -158,6 +73,6 @@ const Game = (props) => {
       </div>
     </div>
   );
-};
+}
 
 export default Game;

packages/play-node-go/src/pages/Layout/MainWrapper/MainWrapper.scss

@@ -1,5 +1,4 @@
 @import '../../../../public/stylesheets/partials/mixins';
-@import '../../../../public/stylesheets/partials/variables';
 
 div.main-wrapper {
   display: flex;
@@ -35,14 +34,3 @@ div.main-wrapper {
     }
   }
 }
-
-button {
-  color:map-get($colors, 'sidebar_link');
-  cursor: pointer;
-  font-family: inherit;
-  font-size: 110%;
-  font-weight: bold;
-  margin-bottom: .5em;
-  padding: 0;
-  text-decoration: none;
-}

packages/play-node-go/src/pages/Layout/NavBar/NavBar.js

@@ -1,36 +1,29 @@
-import React from "react";
+import React from 'react';
-import { Link } from "react-router-dom";
+import { Link } from 'react-router-dom';
-import "./NavBar.scss";
+import './NavBar.scss';
-import Logo from "../../../components/Display/Logo/Logo";
+import Logo from '../../../components/Display/Logo/Logo';
+
+const NavBar = (props) => {
 
-const NavBar = ({ state }) => {
   return (
     <div className="NavBar" data-testid="NavBar">
-      <Link to="/home">
+      <Link to="/home" >
-        <div className="NavBar__logo">
+        <div className="NavBar__logo"><Logo /></div>
-          <Logo />
-        </div>
       </Link>
 
-      <Link to="/home">
+      <Link to="/home" >
-        <div className="NavBar__menu-item NavBar__home">
+        <div className="NavBar__menu-item NavBar__home"><p className="--link">Find a Game</p></div>
-          <p className="--link">Find a Game</p>
-        </div>
       </Link>
       
       <Link to="/news">
-        <div className="NavBar__menu-item NavBar__news">
+        <div className="NavBar__menu-item NavBar__news"><p className="--link">News</p></div>
-          <p className="--link">News</p>
-        </div>
       </Link>
 
       <Link to="/account">
-        <div className="NavBar__menu-item NavBar__account">
+        <div className="NavBar__menu-item NavBar__account">{props.user ? props.user.username : <></>}</div>
-          {state.user.username ? state.user.username : <></>}
-        </div>
       </Link>
     </div>
   );
-};
+}
 
 export default NavBar;

packages/play-node-go/src/reducers/auth/reducer.auth.js

@@ -1,23 +1,20 @@
 export const authReducer = (state, action) => {
   switch (action.message) {
-    case "LOGIN":
+    case 'LOGIN':
       return loginReducer(state, action);
       
-    case "SIGNUP":
+    case 'SIGNUP':
       return loginReducer(state, action);
 
-    case "GUEST":
+    case 'LOGOUT':
-      return loginReducer(state, action);
-
-    case "LOGOUT":
       return state;
 
     default:
       return state;
   } 
-};
+}
 
 function loginReducer(state, action) {
   const newUser = action.body;
-  return { ...state, user: newUser };
+  return {...state, user: newUser };  
 }

packages/play-node-go/src/reducers/games/reducer.games.js

@@ -1,104 +1,62 @@
-import { stateReducer } from "../reducer";
+import { stateReducer } from '../reducer';
 
 export const gamesReducer = (state, action) => {
-  switch (action.message) {
+  switch(action.message) {
-    case "SET_GAMES": {
-      const games = formatGames(action);
-      return { ...state, games };
-    }
 
-    case "JOIN_REQUEST": {
+    case 'SET_GAMES': 
-      return joinRequest(state, action);
+      const games = formatGames(action);;
-    }
+      return {...state, games};
     
-    case "UPDATE_BOARD": {
+    case 'JOIN_REQUEST': 
-      return updateBoard(state, action);
+      if (!Object.entries(state.user).length) {
-    }
+        const errAction = {
+          type: 'ERR',
+          message: 'JOIN_GAME_ERROR',
+          body: {joinGameError: 'user not logged in'}
+        }
+        return stateReducer(state, errAction)
+      }
+      const id = action.body;
+      return {...state, joinGame: id};
 
-    case "GAME_RESIGN": {
+    case 'UPDATE_BOARD': 
-      return gameResign(state, action);
+      console.log(action.body)
-    }
+      return {...state, board: action.body};
 
-    case "SET_ACTIVE": {
+    case 'SET_ACTIVE': 
-      return { ...state, active: action.body };
+      return {...state, active: action.body};
-    }
       
-    case "GAME_END": {
-      return gameEnd(state, action);
-    }
-
-    default: {
-      return state;
-    }
-  }
-};
-
-// parse ranks from db in K9 format to 9k format
-function parseRank(rank) {
-  switch (rank[0]) {
-    // Dan ranks
-    case "D":
-      return `${rank.slice(1)}${rank[0].toLowerCase()}`;
-    // Kyu ranks
-    case "K":
-      return `${rank.slice(1)}${rank[0].toLowerCase()}`;
-    // Unranked
-    case "U":
-      return "?";
     default: 
-      return "?";
+      return state;
+  }
+}
+
+function parseRank(rank) {
+  switch(rank[0]) {
+    case 'D':
+      return `${rank.slice(1)}${rank[0].toLowerCase()}`
+      case 'K':
+      return `${rank.slice(1)}${rank[0].toLowerCase()}`
+    case 'U':
+      return '?'
+    default: 
+      return '?'
   }
 }
 
 function formatGames(action) {
-  const games = [...action.body].map((game) => {
+  const games = [...action.body].map(game => {
+
     if (game.playerBlackRank) {
-      game.playerBlackRank = parseRank(game.playerBlackRank);
+      game.playerBlackRank = parseRank(game.playerBlackRank)
     }
 
     if (game.playerWhiteRank) {
-      game.playerWhiteRank = parseRank(game.playerWhiteRank);
+      game.playerWhiteRank = parseRank(game.playerWhiteRank)
     }
 
     return game;
-  });
+  })
 
   return games;
 }
-
-function joinRequest(state, action) {
-  if (!Object.entries(state.user).length) {
-    const errAction = {
-      type: "ERR",
-      message: "JOIN_GAME_ERROR",
-      body: { joinGameError: "user not logged in" },
-    };
-    return stateReducer(state, errAction);
-  }
-  const id = action.body;
-  return { ...state, joinGame: id };
-}
-
-function updateBoard(state, action) {
-  console.log(action.body);
-  const { gameRecord, pass, turn, winner, playerState } = action.body.meta;
-  const territory = action.body.territory;
-  return {
-    ...state,
-    board: action.body.board,
-    meta: { gameRecord, pass, turn, winner, playerState, territory },
-  };
-}
-
-function gameResign(state, action) {
-  const { gameRecord, pass, turn, winner, playerState } = action.body;
-  return {
-    ...state,
-    meta: { gameRecord, pass, turn, winner, playerState },
-  };
-}
-
-function gameEnd(state, action) {
-  const { winner, score } = action.body.meta;
-  return { ...state, meta: { ...state.meta, winner, score } };
-}

packages/play-node-go/src/reducers/socket/reducer.socket.js

@@ -1,105 +1,69 @@
-import { stateReducer } from "../reducer";
+import { stateReducer } from '../reducer';
-const io = require("../../io");
+const io = require('../../io');
 
 export const socketReducer = (state, action) => {
-  switch (action.message) {
+  switch(action.message) {
-    case "CONNECTED":
-      return { ...state, connect: { type: "home", location: action.body.nsp } };
 
-    case "LAUNCH": {
+    case 'CONNECTED':
-      const { nsp, dispatch } = action.body;
+      console.log(action.body.nsp)
+      return {...state, connect: { type: 'home', location: action.body.nsp } }
+
+    case 'LAUNCH': {
+      const {nsp, dispatch} = action.body;
       const launchedSocket = io.launch(nsp, dispatch);
-      return { ...state, socket: launchedSocket };
+      return {...state, socket: launchedSocket};
     }
 
-    case "CONNECT_ROOM": {
+    case 'CONNECT_ROOM': {
-      const { user, room, dispatch } = action.body;
+      const {user, room, dispatch} = action.body;
       let priorSocket = state.socket;
       if (!priorSocket.nsp) {
-        priorSocket = io.launch("", dispatch);
+        priorSocket = io.launch('', dispatch)
       }
       if (priorSocket.nsp !== `/${room}`) {
-        priorSocket.emit("connect_room", { user, room });
+        priorSocket.emit('connect_room', {user, room});
         priorSocket.close();
       }
       const socket = io.launch(room, dispatch);
-      return { ...state, socket };
+      return {...state, socket}
     }
 
-    case "CONNECT_GAME": {
+    case 'CONNECT_GAME': {
       return connectGame(state, action);
     }
 
-    case "MAKE_MOVE": {
+    case 'MAKE_MOVE': {
       return makeMove(state, action);
     }
 
-    case "RESIGN": {
-      return resign(state, action);
-    }
-
-    case "PASS": {
-      return pass(state, action);
-    }
-
-    case "TOGGLE_TERRITORY": {
-      return toggleTerritory(state, action);
-    }
-
-    case "END_GAME": {
-      return endGame(state, action);
-    }
-
     default:
       return state;
   }
-};
+}
 
-function connectGame(state, action) {
+function connectGame (state, action) {
   const { user, game, dispatch } = action.body;
   const priorSocket = state.socket;
   let updatedState;
-  if (!priorSocket.nsp || priorSocket.nsp !== `/${game.room}`) {
+  if ( !priorSocket.nsp || priorSocket.nsp !== `/${game.room}` ) {
     const connectRoomAction = {
-      type: "SOCKET",
+      type: 'SOCKET',
-      message: "CONNECT_ROOM",
+      message: 'CONNECT_ROOM',
-      body: { user, room: game.room, dispatch },
+      body: { user, room: game.room, dispatch}
-    };
+    }
     updatedState = stateReducer(state, connectRoomAction);
+    
   }
-  if (!updatedState) updatedState = { ...state };
+  if (!updatedState) updatedState = {...state};
   const socket = updatedState.socket;
-  socket.emit("connect_game", { user, game });
+  socket.emit('connect_game', {user, game});
-  return { ...updatedState };
+  return {...updatedState};
 }
 
-function makeMove(state, action) {
+function makeMove (state, action) {
+  // const { user, game, room, board, move } = action.body;
   const socket = state.socket;
-  socket.emit("make_move", { ...action.body });
+  console.log(action)
-  return state;
+  socket.emit('make_move', {...action.body});
-}
-
-function resign(state, action) {
-  const socket = state.socket;
-  socket.emit("resign", { ...action.body });
-  return state;
-}
-
-function pass(state, action) {
-  const socket = state.socket;
-  socket.emit("pass", { ...action.body });
-  return state;
-}
-
-function toggleTerritory(state, action) {
-  const socket = state.socket;
-  socket.emit("toggle_territory", { ...action.body });
-  return state;
-}
-
-function endGame(state, action) {
-  console.log("end game");
-  const socket = state.socket;
-  socket.emit("end_game", { ...action.body });
   return state;
 }

packages/play-node-go/src/services/authServices.js

@@ -1,58 +1,43 @@
-import config from "../config";
+import config from '../config';
 
 const authEndpoint = config.authAddress;
-const signupEndpoint = `${authEndpoint}/signup`;
+const signupEndpoint = `${authEndpoint}/signup`
-const loginEndpoint = `${authEndpoint}/login`;
+const loginEndpoint = `${authEndpoint}/login`
-const guestEndpoint = `${authEndpoint}/guest`;
 
 var headers = new Headers();
-headers.append("Content-Type", "application/json");
+headers.append('Content-Type', 'application/json');
-headers.append("Accept", "application/json");
+headers.append('Accept', 'application/json');
-headers.append("Sec-Fetch-Site", "cross-site");
+headers.append('Sec-Fetch-Site', 'cross-site')
 
-const loginService = async (formData) => {
+const loginService = async(formData) => {
   const response = await fetch(loginEndpoint, {
-    method: "POST",
+    method: 'POST',
-    credentials: "include",
+    credentials: 'include',
     body: JSON.stringify(formData),
-    headers: headers,
+    headers: headers
   })
-    .then((res) => res.text())
+  .then(res => res.text())
-    .then((text) => JSON.parse(text))
+  .then(text => JSON.parse(text))
-    .catch((err) => err);
+  .catch(err => err);
   
   return response;
-};
+}
 
 const signupService = async (formData) => {
   const response = await fetch(signupEndpoint, {
-    method: "POST",
+    method: 'POST',
-    credentials: "include",
+    credentials: 'include',
     body: JSON.stringify(formData),
-    headers: headers,
+    headers: headers
   })
-    .then((res) => res.text())
+  .then(res => res.text())
-    .then((text) => JSON.parse(text))
+  .then(text => JSON.parse(text))
-    .catch((err) => err);
+  .catch(err => err);
 
   return response;
-};
+}
-
-const guestService = async () => {
-  const response = await fetch(guestEndpoint, {
-    method: "POST",
-    credentials: "include",
-    headers,
-  })
-    .then((res) => res.text())
-    .then((text) => JSON.parse(text))
-    .catch((err) => err);
-
-  return response;
-};
 
 export default {
   loginService,
-  signupService,
+  signupService
-  guestService,
+}
-};

packages/server/controllers/api/apiGame.js

@@ -10,9 +10,8 @@ const show = async (req, res, next) => {
     
     // TODO Promise.all()
     const game = await gameQueries.findGameById(gameId);    
-    // const record = await moveQueries.findGameRecord(gameId);
+    const record = await moveQueries.findGameRecord(gameId);
-    // console.log(record)
+    res.status(200).json({game, record})
-    res.status(200).json({game})
   }
   catch (err) {
     res.status(500).json(err);

packages/server/controllers/api/apiRoom.js

@@ -10,9 +10,8 @@ const getAll = async (req, res, next) => {
     res.status(200).json({rooms: [...publicRooms]})
   }
 
-  catch (e) {
+  catch (err) {
-    console.log(e)
+    res.status(500).json(err);
-    res.status(500).json(e);
   }
 }
 
@@ -29,9 +28,9 @@ const show = async (req, res, next) => {
     const body = {currentRoom, messages, roomGames};
     res.status(200).json(body);
   }
-  catch (e) {
+  catch (err) {
-    console.log(e)
+    console.log(err)
-    res.status(500).json(e);
+    res.status(500).json(err);
   }
 }
 

packages/server/controllers/auth.js

@@ -1,16 +1,15 @@
-const { validationResult } = require("express-validator");
+const { validationResult } = require('express-validator');
 
-const userQueries = require("../data/queries/user");
+const userQueries = require('../data/queries/user');
-const { hashPassword, compareHash } = require("../services/bcrypt");
+const { hashPassword, compareHash } = require('../services/bcrypt');
-const signToken = require("../services/signToken");
+const signToken = require('../services/signToken');
-const guestServices = require("../services/guestServices");
 
 const checkValidationErrors = (req, res) => {
   const errors = validationResult(req);
   if (!errors.isEmpty()) {
     return res.status(422).json({ errors: errors.array() });
   }
-};
+}
 
 const signup = async (req, res, next) => {
   checkValidationErrors(req, res);
@@ -21,18 +20,18 @@ const signup = async (req, res, next) => {
     const hashedPassword = await hashPassword(user.password);
     const secureUser = { ...user, password: hashedPassword };
     if (existingUser.length) {
-      return res
+      return res.status(409).json({errors: [{auth: 'User already exists!'}]})
-        .status(409)
-        .json({ errors: [{ auth: "User already exists!" }] });
     }
 
     const newUser = await userQueries.insertUser(secureUser);
-    signToken(res, newUser);
+    signToken(res, newUser)
-    res.status(201).json({ ...newUser });
+    res.status(201).json({...newUser});
-  } catch (err) {
+  } 
+
+  catch (err) {
     res.status(500).json(err);
   }
-};
+}
 
 const login = async (req, res, next) => {
   checkValidationErrors(req, res);
@@ -43,46 +42,29 @@ const login = async (req, res, next) => {
     const savedUser = queryResults[0] || null;
     
     if (!savedUser) {
-      return res.status(401).send({ errors: "bad credentials" });
+      return res.status(401).send({errors: 'bad credentials'});
     }
     
     const hashedPassword = savedUser.password;
     const passwordMatch = await compareHash(user.password, hashedPassword);
 
     if (!passwordMatch) {
-      return res.status(401).send({ errors: "bad credentials" });
+      return res.status(401).send({errors: 'bad credentials'});
     }
     
-    const authorizedUser = { ...savedUser };
+    const authorizedUser = {...savedUser};
     delete authorizedUser.password;
     
     signToken(res, authorizedUser);
-    res.send({ ...authorizedUser }).status(200);
+    res.send({...authorizedUser}).status(200);
-  } catch (e) {
-    res.status(500).send({ errors: e });
   }
-};
   
-const guest = async (req, res, next) => {
+  catch (err) {
-  try {
+    res.status(500).send({errors: err});
-    // username generator returns `Guest-${num}`
-    const { username, password } = guestServices.generateGuest();
-    // generateGuestUser();
-    const email = null;
-    // id generator returns `
-    const id = null;
-    const user = { username, email, id, password };
-    signToken(res, user);
-    delete user.password;
-    res.send(user);
-  } catch (e) {
-    console.log(e);
-    res.status(500).send({ errors: e });
   }
-};
+}
 
 module.exports = {
   signup,
-  login,
+  login
-  guest,
+}
-};

packages/server/data/migrations/20200120224032_game.js

@@ -1,81 +1,49 @@
-const winType = ["B+R", "B+", "B+T", "W+R", "W+", "W+T", "0", "Void", "?"];
+const winType = [
+  'B+R', 'B+', 'B+T',
+  'W+R', 'W+', 'W+T',
+  '0', 'Void', '?'
+]
 
 const rankArray = [
-  "D9",
+  'D9', 'D8', 'D7', 'D6', 'D5', 'D4', 'D3', 'D2', 'D1',
-  "D8",
+  'K1', 'K2', 'K3', 'K4', 'K5', 'K6', 'K7', 'K8', 'K9', 'K10',
-  "D7",
+  'K11', 'K12', 'K13', 'K14', 'K15', 'K16', 'K17', 'K18', 'K19', 'K20',
-  "D6",
+  'K21', 'K22', 'K23', 'K24', 'K25', 'K26', 'K27', 'K28', 'K29', 'K30', 'UR'
-  "D5",
+]
-  "D4",
-  "D3",
-  "D2",
-  "D1",
-  "K1",
-  "K2",
-  "K3",
-  "K4",
-  "K5",
-  "K6",
-  "K7",
-  "K8",
-  "K9",
-  "K10",
-  "K11",
-  "K12",
-  "K13",
-  "K14",
-  "K15",
-  "K16",
-  "K17",
-  "K18",
-  "K19",
-  "K20",
-  "K21",
-  "K22",
-  "K23",
-  "K24",
-  "K25",
-  "K26",
-  "K27",
-  "K28",
-  "K29",
-  "K30",
-  "UR",
-];
 
-exports.up = function (knex) {
+exports.up = function(knex) {
-  return knex.schema.createTable("game", (table) => {
+  return knex.schema.createTable("game", table => {
-    table.increments("id").primary();
+    table.increments('id').primary();
-    table.datetime("date");
+    table.datetime('date');
-    table.float("komi").default(6.5);
+    table.float('komi').default(6.5);
-    table.integer("handicap").default(0);
+    table.integer('handicap').default(0);
-    table.integer("board_size").default(19);
+    table.integer('board_size').default(19);
-    table.boolean("open").default(true);
+    table.boolean('open').default(true);
 
-    table.string("application");
+    table.string('application');
-    table.string("application_version");
+    table.string('application_version');
     table.timestamps(true, true);
 
-    table.string("player_black");
+    table.string('player_black');
-    table.string("player_white");
+    table.string('player_white');
-    table.enu("player_black_rank", rankArray).default("UR");
+    table.enu('player_black_rank', rankArray).default('UR');
-    table.enu("player_white_rank", rankArray).default("UR");
+    table.enu('player_white_rank', rankArray).default('UR');
     
-    table.string("event");
+    table.string('event');
-    table.string("name");
+    table.string('name');
-    table.string("description");
+    table.string('description');
-    table.integer("round");
+    table.integer('round');
     
-    table.enu("win_type", winType);
+    table.enu('win_type', winType);
-    table.float("score");
+    table.float('score');
-    table.integer("captures_black");
+    table.integer('captures_black');
-    table.integer("captures_white");
+    table.integer('captures_white');
 
-    table.integer("user_black").references("id").inTable("user");
+    table.integer('user_black').references('id').inTable('user');
-    table.integer("user_white").references("id").inTable("user");
+    table.integer('user_white').references('id').inTable('user');
-    table.integer("room").references("id").inTable("room");
+    table.integer('room').references('id').inTable('room');
-    table.integer("time_setting").references("id").inTable("time_setting");
+    table.integer('time_setting').references('id').inTable('time_setting');
-  });
+  })
 };
 
-exports.down = (knex) => knex.schema.dropTableIfExists("game");
+exports.down = knex => knex.schema.dropTableIfExists("game");

packages/server/data/migrations/20200120230921_move.js

@@ -1,18 +1,17 @@
-const players = ["white", "black"];
+const players = ['white', 'black']
 
-exports.up = (knex) => {
+exports.up = knex => {
-  return knex.schema.createTable("move", (table) => {
+  return knex.schema.createTable("move", table => {
-    table.increments("id").primary();
+    table.increments('id').primary();
-    table.enu("player", players).notNullable();
+    table.enu('player', players).notNullable();
-    table.integer("point_x").notNullable();
+    table.integer('point_x').notNullable();
-    table.integer("point_y").notNullable();
+    table.integer('point_y').notNullable();
-    table.integer("number").notNullable();
+    table.integer('number').notNullable();
-    table.boolean("game_record").notNullable().default(true);
+    table.boolean('game_record').notNullable().default(true);
-    table.boolean("placement").notNullable().default(false);
 
-    table.integer("game").references("id").inTable("game").notNullable();
+    table.integer('game').references('id').inTable('game').notNullable();
-    table.integer("prior_move").references("id").inTable("move");
+    table.integer('prior_move').references('id').inTable('move');
   });
 };
 
-exports.down = (knex) => knex.schema.dropTableIfExists("move");
+exports.down = knex => knex.schema.dropTableIfExists("move");

packages/server/data/queries/game.js

@@ -1,97 +1,48 @@
-const knex = require("../db");
+const knex = require('../db');
 
 const gameDetailSelect = [
-  "game.id",
+  'game.id', 'application', 'application_version',
-  "application",
+  'board_size', 'komi', 'handicap', 'open', 'win_type',
-  "application_version",
+  'player_black', 'player_black_rank', 'player_white', 'player_white_rank',
-  "board_size",
+  'captures_black', 'captures_white', 'score', 'win_type',
-  "komi",
+  'description', 'event', 'round', 'name', 'room'
-  "handicap",
+]
-  "open",
-  "win_type",
-  "player_black",
-  "player_black_rank",
-  "player_white",
-  "player_white_rank",
-  "captures_black",
-  "captures_white",
-  "score",
-  "win_type",
-  "description",
-  "event",
-  "round",
-  "name",
-  "room",
-];
 
 const timeSettingSelect = [
-  "main_time",
+  'main_time', 'time_period', 'period_length', 'overtime', 'overtime_period', 'overtime_length'
-  "time_period",
+]
-  "period_length",
-  "overtime",
-  "overtime_period",
-  "overtime_length",
-];
 
 const gameOverviewSelect = [
-  "id",
+  'id', 'board_size', 'komi', 'handicap', 'open', 'win_type',
-  "board_size",
+  'player_black', 'player_black_rank', 'player_white', 'player_white_rank'
-  "komi",
+]
-  "handicap",
-  "open",
-  "win_type",
-  "player_black",
-  "player_black_rank",
-  "player_white",
-  "player_white_rank",
-];
 
 const findGameById = async function (gameId) {
   const selection = gameDetailSelect.concat(timeSettingSelect);
 
   const game = await knex
-    .from("game")
+  .from('game')
-    .select(selection)
+  .select(selection)
-    .where({ "game.id": gameId })
+  .where({'game.id': gameId})
-    .leftJoin("time_setting", function () {
+  .leftJoin('time_setting', function() { this.on('time_setting.id', '=', 'game.time_setting')})
-      this.on("time_setting.id", "=", "game.time_setting");
-    });
   
   return game[0];
-};
+}
 
 const findGameByRoom = async (roomId) => {
-  const games = await knex("game")
+  const games = await knex('game')
-    .where({ room: roomId })
+  .where({'room': roomId})
-    .select(gameOverviewSelect);
+  .select(gameOverviewSelect);
   
   return games;
-};
+}
 
-const insertGame = async (game) => {};
+const insertGame = async (game) => {
 
-const endGame = async ({ id, winType, score, bCaptures, wCaptures }) => {
+}
-  try {
-    const game = await knex
-      .from("game")
-      .returning(gameDetailSelect)
-      .where({ id: id })
-      .update({
-        win_type: winType,
-        score: score,
-        captures_black: bCaptures,
-        captures_white: wCaptures,
-        open: false,
-      });
-    return game;
-  } catch (e) {
-    return e;
-  }
-};
 
 module.exports = {
   findGameById,
   findGameByRoom,
-  insertGame,
+  insertGame
-  endGame,
+}
-};

packages/server/data/queries/move.js

@@ -1,47 +1,11 @@
-const knex = require("../db");
+const knex = require('../db');
 
 const findGameRecord = async (gameId) => {
-  return await knex("move")
+  return await knex('move')
-    .where({ game: gameId, game_record: true })
+  .where({'game': gameId, 'game_record': true})
-    .select("player", "point_x", "point_y", "number", "prior_move", "placement")
+  .select('*');
-    .orderBy("number")
+}
-    .then((record) =>
-      record.map(({ player, point_x, point_y }) => ({
-        player,
-        pos: { x: point_x, y: point_y },
-      }))
-    );
-  // .then(res => res)
-};
-
-// id: 1, player: 'black', point_x: 3,  point_y: 3, number: 1, game_record: true, game: 1, prior_move: null
-
-const addMove = async ({ gameId, player, x, y, gameRecord, priorMove }) => {
-  // ! priorMove must be FK not move number
-  const number = priorMove + 1;
-  let result;
-  try {
-    result = await knex("move")
-      .returning("*")
-      .insert({
-        game: gameId,
-        player,
-        point_x: x,
-        point_y: y,
-        number,
-        game_record: gameRecord,
-        prior_move: priorMove,
-      })
-      .then((res) => res);
-  } catch (e) {
-    result = e;
-  } finally {
-    console.log(result);
-    return result;
-  }
-};
 
 module.exports = {
-  findGameRecord,
+  findGameRecord
-  addMove,
+}
-};

packages/server/data/seeds/01_room.js

@@ -5,8 +5,8 @@ exports.seed = function(knex) {
     .then(function () {
       // Inserts seed entries
       return knex('room').insert([
-        {name: 'main', description: 'A general place to play Go'},
+        {id: 1, name: 'main', description: 'A general place to play Go'},
-        {name: 'private', description: 'A private place to play Go', private: true},
+        {id: 2, name: 'private', description: 'A private place to play Go', private: true},
       ]);
     });
 };

packages/server/data/seeds/02_timeSetting.js

@@ -5,7 +5,7 @@ exports.seed = function(knex) {
     .then(function () {
       // Inserts seed entries
       return knex('time_setting').insert([
-        {main_time: 'untimed', time_period: 1, period_length: 0, overtime: 'untimed', overtime_period: 0, overtime_length: 0},
+        {id: 1, main_time: 'untimed', time_period: 1, period_length: 0, overtime: 'untimed', overtime_period: 0, overtime_length: 0},
       ]);
     });
 };

packages/server/data/seeds/03_user.js

@@ -10,9 +10,9 @@ exports.seed = async function(knex) {
   .then(async function () {
       const hashedPassword = await hashPassword(password);
       // Inserts seed entries
-      return knex('user').returning('*').insert([
+      return knex('user').insert([
-        {username: 'user-one', email: email, password: hashedPassword, admin: true},
+        {id: 2, username: 'user-one', email: email, password: hashedPassword, admin: true},
-        {username: 'user-two', email: `2${email}`, password: hashedPassword, admin: true},
+        {id: 3, username: 'user-two', email: `2${email}`, password: hashedPassword, admin: true},
-      ]).then(entries => console.log({success: 'user', entries}));
+      ]);
     });
 };

packages/server/data/seeds/04_game.js

@@ -1,72 +1,33 @@
-exports.seed = async function (knex) {
+
+exports.seed = function(knex) {
   // Deletes ALL existing entries
-  return await knex("game")
+  return knex('game').del()
-    .del()
+    .then(function () {
-    .then(async function () {
       // Inserts seed entries
-      await knex("user")
+      return knex('game').insert([
-        .select("id")
+        { 
-        .orderBy("id")
+          id: 1, date: new Date(), 
-        .whereIn("username", ["user-one", "user-two"])
+          application: 'node-go', application_version: '0.1.0', 
-        .then(async ([userOne, userTwo]) => {
+          player_black: 'user-one', player_white: 'user-two',
-          const res = await knex("room")
+          player_black_rank: 'UR', player_white_rank: 'UR',
-            .select("id")
+          user_black: 2, user_white: 3,
-            .where({ name: "main" })
+          room: 1, time_setting: 1, open: false
-            .then(([room]) => {
+        },
-              console.log("inserting");
+        { 
-              return knex("game")
+          id: 2, date: new Date(), 
-                .insert(
+          application: 'node-go', application_version: '0.1.0', 
-                  [
+          player_black: 'user-one', player_black_rank: 'UR',
-                    {
+          user_black: 2,
-                      date: new Date(),
+          room: 1, time_setting: 1, open: true
-                      application: "node-go",
+        },
-                      application_version: "0.1.0",
+        { 
-                      player_black: "user-one",
+          id: 3, date: new Date('1971-05-06'), 
-                      player_white: "user-two",
+          application: 'node-go', application_version: '0.1.0', 
-                      player_black_rank: "UR",
+          player_black: 'Ishida Yoshio', player_black_rank: 'D7',
-                      player_white_rank: "UR",
+          player_white: 'Rin Kaiho', player_white_rank: 'D9',
-                      user_black: userOne.id,
+          room: 1, time_setting: 1, open: false,
-                      user_white: userTwo.id,
+          event: '', round: 2, win_type: 'B+', score: 1.5 
-                      room: room.id,
+        }
-                      open: false,
+      ]);
-                    },
-                    {
-                      date: new Date(),
-                      application: "node-go",
-                      application_version: "0.1.0",
-                      player_black: "user-one",
-                      player_black_rank: "UR",
-                      user_black: userTwo.id,
-                      room: room.id,
-                      open: true,
-                    },
-                    {
-                      date: new Date("1971-05-06"),
-                      application: "node-go",
-                      application_version: "0.1.0",
-                      player_black: "Ishida Yoshio",
-                      player_black_rank: "D7",
-                      player_white: "Rin Kaiho",
-                      player_white_rank: "D9",
-                      room: room.id,
-                      open: false,
-                      event: "",
-                      round: 2,
-                      win_type: "B+",
-                      score: 1.5,
-                    },
-                  ],
-                  ["*"]
-                )
-                .then((res) => res)
-                .catch((e) => {
-                  console.log("error");
-                  console.log(e);
-                });
-            })
-            .then((entries) => {
-              console.log({ success: "game", entries });
-            });
-        });
     });
 };

packages/server/data/seeds/05_message.js

@@ -1,27 +1,11 @@
 
-exports.seed = async function(knex) {
+exports.seed = function(knex) {
   // Deletes ALL existing entries
-  return await knex('message').del()
+  return knex('message').del()
-    .then(async function () {
+    .then(function () {
       // Inserts seed entries
-      await knex('room')
+      return knex('message').insert([
-        .where({name: 'main'})
+        {id: 1, content: 'Hey! Welcome to the general room!', room: 1, user: 2}
-        .then(async ([room]) => await knex('user')
+      ]);
-          .where({username: 'user-two'})
+    });
-          .then(async ([user]) => {
-            const res = await knex('message')
-            .returning('*')
-            .insert(
-              [
-                {content: 'Hey! Welcome to the general room!', room: room.id, user: user.id}
-              ]
-            )
-            .then(entries => {console.log({success: 'message', entries}); return res;})
-            .catch(e => e)
-            return res;
-          }
-          )
-          .then(() => {})
-        ).then(() => {})
-    }).then(() => {})
 };

packages/server/middleware/userValidator.js

@@ -1,4 +1,4 @@
-const {check, body, validationResult} = require('express-validator');
+const {check, sanitize, validationResult} = require('express-validator');
 
 const signupValidationRules = () => {
   return [
@@ -7,7 +7,7 @@ const signupValidationRules = () => {
     check('password', 'invalid password').isString().isLength({min: 8}),
     check('confirmPassword', 'invalid password').isString()
       .custom((confirmPassword, { req }) => confirmPassword === req.body.password),
-    body('username').escape()
+    sanitize('username').escape()
   ]
 }
 

packages/server/package-lock.json

@@ -24,9 +24,9 @@
       "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8="
     },
     "ansi-regex": {
-      "version": "2.1.1",
+      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+      "integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg="
     },
     "aproba": {
       "version": "1.2.0",
@@ -176,12 +176,12 @@
       }
     },
     "bcrypt": {
-      "version": "4.0.1",
+      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-4.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/bcrypt/-/bcrypt-3.0.7.tgz",
-      "integrity": "sha512-hSIZHkUxIDS5zA2o00Kf2O5RfVbQ888n54xQoF/eIaquU4uaLxK8vhhBdktd0B3n2MjkcAWzv4mnhogykBKOUQ==",
+      "integrity": "sha512-K5UglF9VQvBMHl/1elNyyFvAfOY9Bj+rpKrCSR9sFwcW8FywAYJSRwTURNej5TaAK2TEJkcJ6r6lh1YPmspx5Q==",
       "requires": {
-        "node-addon-api": "^2.0.0",
+        "nan": "2.14.0",
-        "node-pre-gyp": "0.14.0"
+        "node-pre-gyp": "0.13.0"
       }
     },
     "better-assert": {
@@ -197,6 +197,11 @@
       "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.5.tgz",
       "integrity": "sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="
     },
+    "bluebird": {
+      "version": "3.7.2",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
+      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+    },
     "body-parser": {
       "version": "1.18.3",
       "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
@@ -212,16 +217,6 @@
         "qs": "6.5.2",
         "raw-body": "2.3.3",
         "type-is": "~1.6.16"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.23",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
-          "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        }
       }
     },
     "brace-expansion": {
@@ -297,9 +292,9 @@
       "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA="
     },
     "chownr": {
-      "version": "1.1.4",
+      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.3.tgz",
-      "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg=="
+      "integrity": "sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw=="
     },
     "class-utils": {
       "version": "0.3.6",
@@ -342,9 +337,9 @@
       "integrity": "sha512-6S062WDQUXi6hOfkO/sBPVwE5ASXY4G2+b4atvhJfSsuUUhIaUKlkjLe9692Ipyt5/a+IPF5aVTu3V5gvXq5cg=="
     },
     "commander": {
-      "version": "5.1.0",
+      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-5.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.0.tgz",
-      "integrity": "sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg=="
+      "integrity": "sha512-NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw=="
     },
     "component-bind": {
       "version": "1.0.0",
@@ -382,16 +377,16 @@
       "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="
     },
     "cookie": {
-      "version": "0.4.0",
+      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-      "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
     },
     "cookie-parser": {
-      "version": "1.4.5",
+      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.5.tgz",
+      "resolved": "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.4.tgz",
-      "integrity": "sha512-f13bPUj/gG/5mDr+xLmSxxDsB9DQiTIfhJS/sqjrmfAWiAN+x2O4i/XguTL9yDZ+/IFDanJ+5x7hC4CXT9Tdzw==",
+      "integrity": "sha512-lo13tqF3JEtFO7FyA49CqbhaFkskRJ0u/UAiINgrIXeRCY41c88/zxtrECl8AKH3B0hj9q10+h3Kt8I7KlW4tw==",
       "requires": {
-        "cookie": "0.4.0",
+        "cookie": "0.3.1",
         "cookie-signature": "1.0.6"
       }
     },
@@ -425,13 +420,6 @@
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "requires": {
         "ms": "2.0.0"
-      },
-      "dependencies": {
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
       }
     },
     "decode-uri-component": {
@@ -530,9 +518,9 @@
       "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k="
     },
     "engine.io": {
-      "version": "3.4.1",
+      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.4.0.tgz",
-      "integrity": "sha512-8MfIfF1/IIfxuc2gv5K+XlFZczw/BpTvqBdl0E2fBLkYQp4miv4LuDTVtYt4yMyaIFLEr4vtaSgV4mjvll8Crw==",
+      "integrity": "sha512-XCyYVWzcHnK5cMz7G4VTu2W7zJS7SM1QkcelghyIk/FmobWBtXE7fwhBusEKvCSqc3bMh8fNFMlUkCKTFRxH2w==",
       "requires": {
         "accepts": "~1.3.4",
         "base64id": "2.0.0",
@@ -542,11 +530,6 @@
         "ws": "^7.1.2"
       },
       "dependencies": {
-        "cookie": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-          "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
-        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -554,13 +537,18 @@
           "requires": {
             "ms": "^2.1.1"
           }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         }
       }
     },
     "engine.io-client": {
-      "version": "3.4.1",
+      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.4.0.tgz",
-      "integrity": "sha512-RJNmA+A9Js+8Aoq815xpGAsgWH1VoSYM//2VgIiu9lNOaHFfLpTjH4tOzktBpjIs5lvOfiNY1dwf+NuU6D38Mw==",
+      "integrity": "sha512-a4J5QO2k99CM2a0b12IznnyQndoEvtA4UAldhGzKqnHf42I3Qs2W5SPnDvatZRcMaNZs4IevVicBPayxYt6FwA==",
       "requires": {
         "component-emitter": "1.2.1",
         "component-inherit": "0.0.3",
@@ -588,6 +576,11 @@
             "ms": "^2.1.1"
           }
         },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
         "ws": {
           "version": "6.1.4",
           "resolved": "https://registry.npmjs.org/ws/-/ws-6.1.4.tgz",
@@ -615,11 +608,6 @@
       "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
       "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg="
     },
-    "esm": {
-      "version": "3.2.25",
-      "resolved": "https://registry.npmjs.org/esm/-/esm-3.2.25.tgz",
-      "integrity": "sha512-U1suiZ2oDVWv4zPO56S0NcR5QriEahGtdN2OR6FiOG4WJvcjBVFB0qI4+eKoWFH483PKGuLuu6V8Z4T5g63UVA=="
-    },
     "etag": {
       "version": "1.8.1",
       "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
@@ -700,22 +688,15 @@
         "type-is": "~1.6.16",
         "utils-merge": "1.0.1",
         "vary": "~1.1.2"
-      },
-      "dependencies": {
-        "cookie": {
-          "version": "0.3.1",
-          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
-          "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s="
-        }
       }
     },
     "express-validator": {
-      "version": "6.4.1",
+      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/express-validator/-/express-validator-6.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/express-validator/-/express-validator-6.3.1.tgz",
-      "integrity": "sha512-9lVLCv9n735j6LjZwrINKhfv30ek1U4LVy/2jU1j4QotQ8A72Saw63wTu8/zXGZajP3scqf46PJxqquGF340Bg==",
+      "integrity": "sha512-YQHQKP/zlUTN6d38uWwXgK3At5phK6R24pOB/ImWisMUz/U/1AC3ZXMgiZYhtH4ViYJ6UAiV0/nj8s1Qs3kmvw==",
       "requires": {
         "lodash": "^4.17.15",
-        "validator": "^12.1.0"
+        "validator": "^11.1.0"
       }
     },
     "extend": {
@@ -921,6 +902,39 @@
         "string-width": "^1.0.1",
         "strip-ansi": "^3.0.1",
         "wide-align": "^1.1.0"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8="
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+          "requires": {
+            "number-is-nan": "^1.0.0"
+          }
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+          "requires": {
+            "code-point-at": "^1.0.0",
+            "is-fullwidth-code-point": "^1.0.0",
+            "strip-ansi": "^3.0.0"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+          "requires": {
+            "ansi-regex": "^2.0.0"
+          }
+        }
       }
     },
     "get-value": {
@@ -934,9 +948,9 @@
       "integrity": "sha512-9jb7AW5p3in+IiJWhQiZmmwkpLaR/ccTWdWQCtZM66HJcHHLegowh4q4tSD7gouUyeNvFWRavfK9GXosQHDpFA=="
     },
     "glob": {
-      "version": "7.1.6",
+      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
       "requires": {
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
@@ -1039,19 +1053,12 @@
         "inherits": "2.0.3",
         "setprototypeof": "1.1.0",
         "statuses": ">= 1.4.0 < 2"
-      },
-      "dependencies": {
-        "inherits": {
-          "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-          "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
-        }
       }
     },
     "iconv-lite": {
-      "version": "0.4.24",
+      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
       "requires": {
         "safer-buffer": ">= 2.1.2 < 3"
       }
@@ -1079,9 +1086,9 @@
       }
     },
     "inherits": {
-      "version": "2.0.4",
+      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4="
     },
     "ini": {
       "version": "1.3.5",
@@ -1094,9 +1101,9 @@
       "integrity": "sha512-e0/LknJ8wpMMhTiWcjivB+ESwIuvHnBSlBbmP/pSb8CQJldoj1p2qv7xGZ/+BtbTziYRFSz8OsvdbiX45LtYQA=="
     },
     "ipaddr.js": {
-      "version": "1.9.1",
+      "version": "1.9.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.0.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="
+      "integrity": "sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA=="
     },
     "is-absolute": {
       "version": "1.0.0",
@@ -1176,12 +1183,9 @@
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI="
     },
     "is-fullwidth-code-point": {
-      "version": "1.0.0",
+      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
-      "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
+      "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8="
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
     },
     "is-glob": {
       "version": "4.0.1",
@@ -1270,6 +1274,11 @@
         "semver": "^5.6.0"
       },
       "dependencies": {
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
         "semver": {
           "version": "5.7.1",
           "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
@@ -1297,29 +1306,29 @@
       }
     },
     "kind-of": {
-      "version": "6.0.3",
+      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw=="
+      "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA=="
     },
     "knex": {
-      "version": "0.21.1",
+      "version": "0.20.7",
-      "resolved": "https://registry.npmjs.org/knex/-/knex-0.21.1.tgz",
+      "resolved": "https://registry.npmjs.org/knex/-/knex-0.20.7.tgz",
-      "integrity": "sha512-uWszXC2DPaLn/YznGT9wFTWUG9+kqbL4DMz+hCH789GLcLuYzq8werHPDKBJxtKvxrW/S1XIXgrTWdMypiVvsw==",
+      "integrity": "sha512-Yu5WfQqK9JSkxMAWnCdeWbsjTKTzsjMYjqmUowOQnyLMs4RspVehqXCVjg+aTtcVrTtIZ3WvoeE00OzFsZKJow==",
       "requires": {
+        "bluebird": "^3.7.2",
         "colorette": "1.1.0",
-        "commander": "^5.1.0",
+        "commander": "^4.1.0",
         "debug": "4.1.1",
-        "esm": "^3.2.25",
         "getopts": "2.2.5",
         "inherits": "~2.0.4",
         "interpret": "^2.0.0",
         "liftoff": "3.1.0",
         "lodash": "^4.17.15",
-        "mkdirp": "^1.0.4",
+        "mkdirp": "^0.5.1",
-        "pg-connection-string": "2.2.0",
+        "pg-connection-string": "2.1.0",
-        "tarn": "^3.0.0",
+        "tarn": "^2.0.0",
         "tildify": "2.0.0",
-        "uuid": "^7.0.3",
+        "uuid": "^3.3.3",
         "v8flags": "^3.1.3"
       },
       "dependencies": {
@@ -1331,15 +1340,20 @@
             "ms": "^2.1.1"
           }
         },
-        "mkdirp": {
+        "inherits": {
-          "version": "1.0.4",
+          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-          "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="
+          "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
         "pg-connection-string": {
-          "version": "2.2.0",
+          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.2.0.tgz",
+          "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.1.0.tgz",
-          "integrity": "sha512-xB/+wxcpFipUZOQcSzcgkjcNOosGhEoPSjz06jC89lv1dj7mc9bZv6wLVy8M2fVjP0a/xN0N988YDq1L0FhK3A=="
+          "integrity": "sha512-bhlV7Eq09JrRIvo1eKngpwuqKtJnNhZdpdOlvrPrA4dxqXPjxSrbNrfnIDmTpwMyRszrcV4kU5ZA4mMsQUrjdg=="
         }
       }
     },
@@ -1359,9 +1373,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.19",
+      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
+      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
     },
     "lodash.includes": {
       "version": "4.3.0",
@@ -1460,16 +1474,16 @@
       "integrity": "sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ=="
     },
     "mime-db": {
-      "version": "1.44.0",
+      "version": "1.43.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.44.0.tgz",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.43.0.tgz",
-      "integrity": "sha512-/NOTfLrsPBVeH7YtFPgsVWveuL+4SjjYxaQ1xtM1KMFj7HdxlBlxeyNLzhyJVx7r4rZGJAZ/6lkKCitSc/Nmpg=="
+      "integrity": "sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ=="
     },
     "mime-types": {
-      "version": "2.1.27",
+      "version": "2.1.26",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.27.tgz",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.26.tgz",
-      "integrity": "sha512-JIhqnCasI9yD+SsmkquHBxTSEuZdQX5BuQnS2Vc7puQQQ+8yiP5AY5uWhpdv4YL4VM5c6iliiYWPgJ/nJQLp7w==",
+      "integrity": "sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==",
       "requires": {
-        "mime-db": "1.44.0"
+        "mime-db": "1.43.0"
       }
     },
     "minimatch": {
@@ -1481,9 +1495,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.5",
+      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
     },
     "minipass": {
       "version": "2.9.0",
@@ -1522,11 +1536,11 @@
       }
     },
     "mkdirp": {
-      "version": "0.5.5",
+      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
       "requires": {
-        "minimist": "^1.2.5"
+        "minimist": "0.0.8"
       }
     },
     "morgan": {
@@ -1542,9 +1556,14 @@
       }
     },
     "ms": {
-      "version": "2.1.2",
+      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+    },
+    "nan": {
+      "version": "2.14.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
+      "integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -1565,9 +1584,9 @@
       }
     },
     "needle": {
-      "version": "2.4.1",
+      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.1.tgz",
+      "resolved": "https://registry.npmjs.org/needle/-/needle-2.4.0.tgz",
-      "integrity": "sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==",
+      "integrity": "sha512-4Hnwzr3mi5L97hMYeNl8wRW/Onhy4nUKR/lVemJ8gJedxxUyBLm9kkrDColJvoSfwi0jCNhD+xCdOtiGDQiRZg==",
       "requires": {
         "debug": "^3.2.6",
         "iconv-lite": "^0.4.4",
@@ -1581,6 +1600,11 @@
           "requires": {
             "ms": "^2.1.1"
           }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         }
       }
     },
@@ -1589,15 +1613,10 @@
       "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz",
       "integrity": "sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="
     },
-    "node-addon-api": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-2.0.0.tgz",
-      "integrity": "sha512-ASCL5U13as7HhOExbT6OlWJJUV/lLzL2voOSP1UVehpRD8FbSrSDjfScK/KwAvVTI5AS6r4VwbOMlIqtvRidnA=="
-    },
     "node-pre-gyp": {
-      "version": "0.14.0",
+      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz",
+      "resolved": "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.13.0.tgz",
-      "integrity": "sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==",
+      "integrity": "sha512-Md1D3xnEne8b/HGVQkZZwV27WUi1ZRuZBij24TNaZwUPU3ZAFtvT6xxJGaUVillfmMKnn5oD1HoGsp2Ftik7SQ==",
       "requires": {
         "detect-libc": "^1.0.2",
         "mkdirp": "^0.5.1",
@@ -1608,7 +1627,7 @@
         "rc": "^1.2.7",
         "rimraf": "^2.6.1",
         "semver": "^5.3.0",
-        "tar": "^4.4.2"
+        "tar": "^4"
       },
       "dependencies": {
         "semver": {
@@ -1619,9 +1638,9 @@
       }
     },
     "nopt": {
-      "version": "4.0.3",
+      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
-      "integrity": "sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==",
+      "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
       "requires": {
         "abbrev": "1",
         "osenv": "^0.1.4"
@@ -1641,13 +1660,12 @@
       "integrity": "sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA=="
     },
     "npm-packlist": {
-      "version": "1.4.8",
+      "version": "1.4.7",
-      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.8.tgz",
+      "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-1.4.7.tgz",
-      "integrity": "sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==",
+      "integrity": "sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==",
       "requires": {
         "ignore-walk": "^3.0.1",
-        "npm-bundled": "^1.0.1",
+        "npm-bundled": "^1.0.1"
-        "npm-normalize-package-bin": "^1.0.1"
       }
     },
     "npmlog": {
@@ -1855,39 +1873,39 @@
       "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w="
     },
     "pg": {
-      "version": "8.1.0",
+      "version": "7.17.0",
-      "resolved": "https://registry.npmjs.org/pg/-/pg-8.1.0.tgz",
+      "resolved": "https://registry.npmjs.org/pg/-/pg-7.17.0.tgz",
-      "integrity": "sha512-Jp+XSNTGYDztc2FgIbmBXeeYMR7kKjfgnl3R+ioO6rkcxDmaea+YPp/gaxe13PBnJAFYyEGl0ixpwPm2gb6eUw==",
+      "integrity": "sha512-70Q4ZzIdPgwMPb3zUIzAUwigNJ4v5vsWdMED6OzXMfOECeYTvTm7iSC3FpKizu/R1BHL8Do3bLs6ltGfOTAnqg==",
       "requires": {
         "buffer-writer": "2.0.0",
         "packet-reader": "1.0.0",
-        "pg-connection-string": "^2.2.2",
+        "pg-connection-string": "0.1.3",
-        "pg-pool": "^3.2.0",
+        "pg-packet-stream": "^1.1.0",
-        "pg-protocol": "^1.2.2",
+        "pg-pool": "^2.0.9",
         "pg-types": "^2.1.0",
         "pgpass": "1.x",
         "semver": "4.3.2"
       }
     },
     "pg-connection-string": {
-      "version": "2.2.2",
+      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-0.1.3.tgz",
-      "integrity": "sha512-+hel4DGuSZCjCZwglAuyi+XlodHnKmrbyTw0hVWlmGN2o4AfJDkDo5obAFzblS5M5PFBMx0uDt5Y1QjlNC+tqg=="
+      "integrity": "sha1-2hhHsglA5C7hSSvq9l1J2RskXfc="
     },
     "pg-int8": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/pg-int8/-/pg-int8-1.0.1.tgz",
       "integrity": "sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="
     },
-    "pg-pool": {
+    "pg-packet-stream": {
-      "version": "3.2.0",
+      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/pg-packet-stream/-/pg-packet-stream-1.1.0.tgz",
-      "integrity": "sha512-7BLwDNDEfPFjE9vmZLcJPLFwuDAVGZ5lIZo2MeQfwYG7EPGfdNVis/dz6obI/yKqvQIx2sf6QBKXMLB+y/ftgA=="
+      "integrity": "sha512-kRBH0tDIW/8lfnnOyTwKD23ygJ/kexQVXZs7gEyBljw4FYqimZFxnMMx50ndZ8In77QgfGuItS5LLclC2TtjYg=="
     },
-    "pg-protocol": {
+    "pg-pool": {
-      "version": "1.2.2",
+      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.2.2.tgz",
+      "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-2.0.9.tgz",
-      "integrity": "sha512-r8hGxHOk3ccMjjmhFJ/QOSVW5A+PP84TeRlEwB/cQ9Zu+bvtZg8Z59Cx3AMfVQc9S0Z+EG+HKhicF1W1GN5Eqg=="
+      "integrity": "sha512-gNiuIEKNCT3OnudQM2kvgSnXsLkSpd6mS/fRnqs6ANtrke6j8OY5l9mnAryf1kgwJMWLg0C1N1cYTZG1xmEYHQ=="
     },
     "pg-types": {
       "version": "2.2.0",
@@ -1925,9 +1943,9 @@
       "integrity": "sha1-AntTPAqokOJtFy1Hz5zOzFIazTU="
     },
     "postgres-date": {
-      "version": "1.0.5",
+      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.5.tgz",
+      "resolved": "https://registry.npmjs.org/postgres-date/-/postgres-date-1.0.4.tgz",
-      "integrity": "sha512-pdau6GRPERdAYUQwkBnGKxEfPyhVZXG/JiS44iZWiNdSOWE09N2lUgN6yshuq6fVSon4Pm0VMXd1srUUkLe9iA=="
+      "integrity": "sha512-bESRvKVuTrjoBluEcpv2346+6kgB7UlnqWZsnbnCccTNq/pqfj1j6oBaN5+b/NrDXepYUT/HKadqv3iS9lJuVA=="
     },
     "postgres-interval": {
       "version": "1.2.0",
@@ -1943,12 +1961,12 @@
       "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
     "proxy-addr": {
-      "version": "2.0.6",
+      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.5.tgz",
-      "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
+      "integrity": "sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==",
       "requires": {
         "forwarded": "~0.1.2",
-        "ipaddr.js": "1.9.1"
+        "ipaddr.js": "1.9.0"
       }
     },
     "qs": {
@@ -1970,16 +1988,6 @@
         "http-errors": "1.6.3",
         "iconv-lite": "0.4.23",
         "unpipe": "1.0.0"
-      },
-      "dependencies": {
-        "iconv-lite": {
-          "version": "0.4.23",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
-          "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
-          "requires": {
-            "safer-buffer": ">= 2.1.2 < 3"
-          }
-        }
       }
     },
     "rc": {
@@ -1991,6 +1999,13 @@
         "ini": "~1.3.0",
         "minimist": "^1.2.0",
         "strip-json-comments": "~2.0.1"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+        }
       }
     },
     "readable-stream": {
@@ -2035,9 +2050,9 @@
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc="
     },
     "resolve": {
-      "version": "1.17.0",
+      "version": "1.14.2",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.14.2.tgz",
-      "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+      "integrity": "sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ==",
       "requires": {
         "path-parse": "^1.0.6"
       }
@@ -2115,13 +2130,6 @@
         "on-finished": "~2.3.0",
         "range-parser": "~1.2.0",
         "statuses": "~1.4.0"
-      },
-      "dependencies": {
-        "ms": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-          "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
-        }
       }
     },
     "serve-static": {
@@ -2167,9 +2175,9 @@
       "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
     },
     "signal-exit": {
-      "version": "3.0.3",
+      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA=="
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0="
     },
     "snapdragon": {
       "version": "0.8.2",
@@ -2288,6 +2296,11 @@
           "requires": {
             "ms": "^2.1.1"
           }
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         }
       }
     },
@@ -2335,6 +2348,11 @@
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
           "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
         },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
+        },
         "socket.io-parser": {
           "version": "3.3.0",
           "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.3.0.tgz",
@@ -2389,6 +2407,11 @@
           "version": "2.0.1",
           "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
           "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4="
+        },
+        "ms": {
+          "version": "2.1.2",
+          "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
+          "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         }
       }
     },
@@ -2455,13 +2478,12 @@
       "integrity": "sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew=="
     },
     "string-width": {
-      "version": "1.0.2",
+      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-2.1.1.tgz",
-      "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
+      "integrity": "sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==",
       "requires": {
-        "code-point-at": "^1.0.0",
+        "is-fullwidth-code-point": "^2.0.0",
-        "is-fullwidth-code-point": "^1.0.0",
+        "strip-ansi": "^4.0.0"
-        "strip-ansi": "^3.0.0"
       }
     },
     "string_decoder": {
@@ -2473,11 +2495,11 @@
       }
     },
     "strip-ansi": {
-      "version": "3.0.1",
+      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz",
-      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "integrity": "sha1-qEeQIusaw2iocTibY1JixQXuNo8=",
       "requires": {
-        "ansi-regex": "^2.0.0"
+        "ansi-regex": "^3.0.0"
       }
     },
     "strip-json-comments": {
@@ -2500,9 +2522,9 @@
       }
     },
     "tarn": {
-      "version": "3.0.0",
+      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/tarn/-/tarn-3.0.0.tgz",
+      "resolved": "https://registry.npmjs.org/tarn/-/tarn-2.0.0.tgz",
-      "integrity": "sha512-PKUnlDFODZueoA8owLehl8vLcgtA8u4dRuVbZc92tspDYZixjJL6TqYOmryf/PfP/EBX+2rgNcrj96NO+RPkdQ=="
+      "integrity": "sha512-7rNMCZd3s9bhQh47ksAQd92ADFcJUjjbyOvyFjNLwTPpGieFHMC84S+LOzw0fx1uh6hnDz/19r8CPMnIjJlMMA=="
     },
     "through": {
       "version": "2.3.8",
@@ -2644,9 +2666,9 @@
       "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM="
     },
     "uuid": {
-      "version": "7.0.3",
+      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
-      "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
+      "integrity": "sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ=="
     },
     "v8flags": {
       "version": "3.1.3",
@@ -2657,9 +2679,9 @@
       }
     },
     "validator": {
-      "version": "12.2.0",
+      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/validator/-/validator-12.2.0.tgz",
+      "resolved": "https://registry.npmjs.org/validator/-/validator-11.1.0.tgz",
-      "integrity": "sha512-jJfE/DW6tIK1Ek8nCfNFqt8Wb3nzMoAbocBF6/Icgg1ZFSBpObdnwVY2jQj6qUqzhx5jc71fpvBWyLGO7Xl+nQ=="
+      "integrity": "sha512-qiQ5ktdO7CD6C/5/mYV4jku/7qnqzjrxb3C/Q5wR3vGGinHTgJZN/TdFT3ZX4vXhX2R1PXx42fB1cn5W+uJ4lg=="
     },
     "vary": {
       "version": "1.1.2",
@@ -2688,9 +2710,9 @@
       "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "ws": {
-      "version": "7.3.0",
+      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.3.0.tgz",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz",
-      "integrity": "sha512-iFtXzngZVXPGgpTlP1rBqsUK82p9tKqsWRPg5L56egiljujJT3vGAYnHANvFxBieXrTFavhzhxW52jnaWV+w2w=="
+      "integrity": "sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A=="
     },
     "xmlhttprequest-ssl": {
       "version": "1.5.5",

packages/server/package.json

@@ -13,7 +13,7 @@
     "reset-db": "./node_modules/.bin/knex migrate:rollback true && npm run migrate && npm run seed"
   },
   "dependencies": {
-    "bcrypt": "^4.0.1",
+    "bcrypt": "^3.0.7",
     "cookie-parser": "~1.4.4",
     "cors": "^2.8.5",
     "debug": "~2.6.9",
@@ -22,9 +22,9 @@
     "express-validator": "^6.3.1",
     "http-errors": "~1.6.3",
     "jsonwebtoken": "^8.5.1",
-    "knex": "^0.21.1",
+    "knex": "^0.20.7",
     "morgan": "~1.9.1",
-    "pg": "^8.1.0",
+    "pg": "^7.17.0",
     "socket.io": "^2.3.0"
   }
 }

packages/server/routes/auth.js

@@ -1,20 +1,10 @@
-const express = require("express");
+const express = require('express');
 const router = express.Router();
-const app = require("../server");
+const app = require('../server');
-const authController = require("../controllers/auth");
+const authController = require('../controllers/auth');
-const {
+const { signupValidationRules, loginValidationRules, validate } = require('../middleware/userValidator');
-  signupValidationRules,
-  loginValidationRules,
-  validate,
-} = require("../middleware/userValidator");
 
-router.post(
+router.post('/signup', signupValidationRules(), validate, authController.signup);
-  "/signup",
+router.post('/login', loginValidationRules(), validate, authController.login);
-  signupValidationRules(),
-  validate,
-  authController.signup
-);
-router.post("/login", loginValidationRules(), validate, authController.login);
-router.post("/guest", authController.guest);
 
 module.exports = router;

packages/server/server.js

@@ -1,21 +1,21 @@
-const createError = require("http-errors");
+const createError = require('http-errors');
-const express = require("express");
+const express = require('express');
 
-const cors = require("cors");
+const cors = require('cors');
 
-const path = require("path");
+const path = require('path');
-const cookieParser = require("cookie-parser");
+const cookieParser = require('cookie-parser');
-const logger = require("morgan");
+const logger = require('morgan');
 
-const db = require("./data/db");
+const db = require('./data/db');
 
-const dotenv = require("dotenv");
+const dotenv = require('dotenv');
 dotenv.config();
 
-const indexRouter = require("./routes/index");
+const indexRouter = require('./routes/index');
-const usersRouter = require("./routes/users");
+const usersRouter = require('./routes/users');
-const authRouter = require("./routes/auth");
+const authRouter = require('./routes/auth');
-const apiRouter = require("./routes/api");
+const apiRouter = require('./routes/api');
 
 const app = express();
 
@@ -23,40 +23,40 @@ const allowedOrigin = process.env.REACT_ADDRESS;
 const corsOptions = {
   origin: allowedOrigin,
   credentials: true,
-  methods: "GET,PUT,POST,DELETE",
+  methods: "GET,PUT,POST,DELETE"
-};
+}
 
-app.options("*", cors(corsOptions));
+app.options('*', cors(corsOptions));
-app.use("*", cors(corsOptions));
+app.use('*', cors(corsOptions));
 
 // disable logging for tests
-if (process.env.NODE_ENV !== "test") app.use(logger("dev"));
+if (process.env.NODE_ENV !== 'test') app.use(logger('dev'));
 
 app.use(express.json());
 app.use(express.urlencoded({ extended: false }));
 app.use(cookieParser());
-app.use(express.static(path.join(__dirname, "public")));
+app.use(express.static(path.join(__dirname, 'public')));
 
-app.use("/", indexRouter);
+app.use('/', indexRouter);
-app.use("/users", usersRouter);
+app.use('/users', usersRouter);
-app.use("/auth", authRouter);
+app.use('/auth', authRouter);
 // @auth
-app.use("/api/v1", apiRouter);
+app.use('/api/v1', apiRouter);
 
 // catch 404 and forward to error handler
-app.use(function (req, res, next) {
+app.use(function(req, res, next) {
   next(createError(404));
 });
 
 // error handler
-app.use(function (err, req, res, next) {
+app.use(function(err, req, res, next) {
   // set locals, only providing error in development
   res.locals.message = err.message;
-  res.locals.error = req.app.get("env") === "development" ? err : {};
+  res.locals.error = req.app.get('env') === 'development' ? err : {};
 
   // render the error page
   res.status(err.status || 500);
-  res.send("error");
+  res.send('error');
 });
 
 module.exports = app;

packages/server/services/Game.v1.js

@@ -1,422 +0,0 @@
-/*----- constants -----*/
-const STONES_DATA = {
-  '-1': 'white',
-  '0': 'none',
-  '1': 'black',
-  'k': 'ko'
-}
-
-
-// index corresponds to difference in player rank
-const KOMI_REC = {
-  '9': [
-    5.5, 2.5, -0.5, -3.5, -6.5, -9.5, 12.5, 15.5, 18.5, 21.5
-  ],
-  '13': [
-    5.5, 0.5, -5.5, 0.5, -5.5, 0.5, -5.5, 0.5, -5.5, 0.5
-  ],
-  '19': [
-    7.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5
-  ]
-}
-
-const HANDI_REC = {
-  '9': [
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0
-  ],
-  '13': [
-    0, 0, 0, 2, 2, 3, 3, 4, 4, 5
-  ],
-  '19': [
-    0, 0, 2, 3, 4, 5, 6, 7, 8, 9
-  ]
-}
-
-// index represents handicap placement for different board-sizes, eg handiPlace['9][1] = { (3, 3), (7, 7) }
-// last array in each property also used for hoshi rendering 
-const HANDI_PLACE = {
-  '9' : [
-    0, 0,
-    [[ 7, 3 ], [ 3, 7 ] ], 
-    [ [ 7, 7 ], [ 7, 3 ], [ 3, 7 ] ], 
-    [ [ 3, 3 ], [ 7, 7 ], [ 3, 7 ], [ 7, 3 ] ] 
-  ],
-  '13' : [
-    0, 0,
-    [ [ 4, 10 ], [ 10, 4 ] ],
-    [ [ 10, 10 ], [ 4, 10 ], [ 10, 4] ],
-    [ [ 4, 4 ], [ 10, 10 ], [ 4, 10 ], [ 10, 4] ],
-    [ [ 7, 7 ], [ 4, 4 ], [ 10, 10 ], [ 4, 10 ], [ 10, 4] ],
-    [ [ 7, 4 ], [ 4, 7 ], [ 4, 4 ], [ 10, 10 ], [ 4, 10 ], [ 10, 4] ],
-    [ [ 7, 7 ], [ 7, 4 ], [ 4, 7 ], [ 4, 4 ], [ 10, 10 ], [ 4, 10 ], [ 10, 4] ],
-    [ [ 10, 7 ], [ 7, 4 ], [ 7, 10 ], [ 4, 7 ], [ 4, 4 ], [ 10, 10 ], [ 4, 10 ], [ 10, 4] ],
-    [ [ 7, 7 ], [ 10, 7 ], [ 7, 4 ], [ 7, 10 ], [ 4, 7 ], [ 4, 4 ], [ 10, 10 ], [ 4, 10 ], [ 10, 4] ],
-  ],
-  '19' : [
-    0, 0,
-    [ [ 4, 16 ], [ 16, 4 ] ],
-    [ [ 16, 16 ], [ 4, 16 ], [ 16, 4] ],
-    [ [ 4, 4 ], [ 16, 16 ], [ 4, 16 ], [ 16, 4] ],
-    [ [ 10, 10 ], [ 4, 4 ], [ 16, 16 ], [ 4, 16 ], [ 16, 4] ],
-    [ [ 10, 4 ], [ 4, 10 ], [ 4, 4 ], [ 16, 16 ], [ 4, 16 ], [ 16, 4] ],
-    [ [ 10, 10 ], [ 10, 4 ], [ 4, 10 ], [ 4, 4 ], [ 16, 16 ], [ 4, 16 ], [ 16, 4] ],
-    [ [ 16, 10 ], [ 10, 4 ], [ 10, 16 ], [ 4, 10 ], [ 4, 4 ], [ 16, 16 ], [ 4, 16 ], [ 16, 4] ],
-    [ [ 10, 10 ], [ 16, 10 ], [ 10, 4 ], [ 10, 16 ], [ 4, 10 ], [ 4, 4 ], [ 16, 16 ], [ 4, 16 ], [ 16, 4] ],
-  ]
-};
-
-class Game {
-  constructor(gameData, gameRecord) {
-    this.winner =       gameData.winner || null,
-    this.turn =         gameData.turn || 1, // turn logic depends on handicap stones
-    this.pass =         gameData.pass || 0, // -1 represents state in which resignation has been submitted, not confirmed
-    this.komi =         gameData.komi || 6.5, // komi depends on handicap stones + player rank
-    this.handicap =     gameData.handicap || 0,
-    this.boardSize =    gameData.boardSize || 19,
-    this.groups =       {},
-    this.boardState =   [],
-    this.gameRecord =   gameRecord || [],
-    this.playerState =  gameData.playerState || {
-      bCaptures: 0,
-      wCaptures: 0,
-      bScore: 0,
-      wScore: 0
-    }
-  }
-
-  initGame = () => {
-    this.winner = null;
-    this.pass =   null;
-    this.turn =   this.handicap ? -1 : 1;
-
-    this.initBoard();
-    return this.getBoardState();
-  }
-
-  initBoard = () => {
-    let i = 0;
-    while (i < this.boardSize * this.boardSize) {
-      let point = new Point( Math.floor(i / this.boardSize) + 1, i % this.boardSize + 1, this)
-      this.boardState.push(point);
-      i++;
-    }
-    this.initHandi();
-  }
-  
-  initHandi = () => {
-    if (this.handicap < 2) return;
-    HANDI_PLACE[this.boardSize][this.handicap].forEach(pt => {
-      if (!pt) return;
-      let handi = this.findPointFromIdx(pt);
-      handi.stone = 1;
-      handi.joinGroup(this);
-    })
-  }
-
-  getBoardState = () => {
-    this.boardState.forEach(point => point.legal = checkLegal(point, this))
-    return this.boardState.reduce((boardState, point) => {
-      boardState[`${point.pos[0]}-${point.pos[1]}`] = point.legal || point.stone;
-      return boardState;
-    }, {})
-  }
-
-  getMeta = () => {
-    return { winner: this.winner, turn: this.turn, pass: this.pass, playerState: this.playerState, gameRecord: this.gameRecord }
-  }
-
-  findPointFromIdx = (arr) => {
-    return this.boardState.find( point => point.pos[0] === arr[0] && point.pos[1] === arr[1] );
-  }
-
-  makeMove = (move) => {
-    const player = move.player === 'white' ? -1 : 1;
-    const point = this.findPointFromIdx([move.pos.x, move.pos.y])
-    if ( !checkLegal(point, this) ) throw Error('illegal move');
-    clearKo(this);
-    clearPass(this);
-    resolveCaptures(point, this);
-    point.stone = this.turn;
-    point.joinGroup(this);
-    clearCaptures(this);
-    this.gameRecord.push(move)
-    this.turn*= -1;
-    return { board: this.getBoardState(), meta: this.getMeta()};
-  }
-
-  clickBoard = (evt) => {
-    evt.stopPropagation();
-    if (gameState.pass > 1 || gameState.winner) return editTerritory(evt);
-    // checks for placement and pushes to cell
-    let placement = [ parseInt(evt.target.closest('td').id.split('-')[0]), parseInt(evt.target.closest('td').id.split('-')[1]) ];
-    let point = findPointFromIdx(placement);
-    //checks that this placement was marked as legal
-    if ( !checkLegal(point) ) return;
-    clearKo();
-    clearPass();
-    resolveCaptures(point);
-    point.stone = gameState.turn;
-    point.joinGroup();
-    playSound(point);
-    clearCaptures();
-    gameState.gameRecord.push(`${STONES_DATA[gameState.turn]}: ${point.pos}`)
-    gameState.turn*= -1;
-  }
-
-}
-
-
-class Point {
-  constructor(x, y, Game) {
-    this.pos = [ x, y ]
-    this.stone = 0; // this is where move placement will go 0, 1, -1, also contains ko: 'k'
-    this.legal;
-    this.territory;
-    this.capturing = [];
-    this.groupMembers = [ this ];
-    this.neighbors = {
-      top: {},
-      btm: {},
-      lft: {},
-      rgt: {}
-    }
-    this.neighbors.top = x > 1 ? [ x - 1, y ] : null;
-    this.neighbors.btm = x < Game.boardSize ? [ x + 1, y ] : null;
-    this.neighbors.rgt = y < Game.boardSize ? [ x, y + 1 ] : null;
-    this.neighbors.lft = y > 1 ? [ x, y - 1 ] : null;
-  } 
-
-  checkNeighbors = (Game) => {
-    let neighborsArr = [];
-    for (let neighbor in this.neighbors) {
-      let nbr = this.neighbors[neighbor];
-      // neighbor exists it's point is stored as { rPos, cPos}
-      if ( nbr !== null ) {
-      neighborsArr.push(Game.boardState.find(pt =>  pt.pos[0] === nbr[0] && pt.pos[1] === nbr[1]))
-      }
-    };
-    // returns array of existing neighbors to calling function
-    return neighborsArr;
-  }
-
-  getLiberties = (Game) => { 
-    let neighborsArr = this.checkNeighbors(Game).filter(pt => pt.stone === 0);
-    return neighborsArr;
-  }
-
-  joinGroup = (Game) => {
-    this.groupMembers = this.groupMembers.filter(grp => grp.stone === this.stone);
-    this.groupMembers.push(this);
-    let frns = this.checkNeighbors(Game).filter(nbr => nbr.stone === this.stone);
-    for (let frn of frns) {
-      this.groupMembers.push(frn);
-    }
-    this.groupMembers = Array.from(new Set(this.groupMembers));
-    for (let grpMem in this.groupMembers) {
-      this.groupMembers = Array.from(new Set(this.groupMembers.concat(this.groupMembers[grpMem].groupMembers)));
-    }
-    for (let grpMem in this.groupMembers) {
-      this.groupMembers[grpMem].groupMembers = Array.from(new Set(this.groupMembers[grpMem].groupMembers.concat(this.groupMembers)));
-    }
-  }
-
-  checkCapture = (Game) => {
-    let opps = this.checkNeighbors(Game).filter(nbr => nbr.stone === Game.turn * -1 
-      && nbr.getLiberties(Game).every(liberty => liberty === this));
-    for (let opp of opps) {
-      if (opp.groupMembers.every(stone => stone.getLiberties().filter(liberty => liberty !== this).length === 0)) {
-        this.capturing = this.capturing.concat(opp.groupMembers);
-      };
-    }
-    this.capturing = Array.from(new Set(this.capturing));
-    return this.capturing;
-  }
-
-  checkGroup = () => { // liberty is true when called by move false when called by check Capture
-    let frns = this.checkNeighbors().filter(nbr => nbr.stone === gameState.turn);
-    for (let frn in frns) {
-      if (frns[frn].groupMembers.find(stone => stone.getLiberties().find(liberty => liberty !== this))) return true;
-      continue;
-      }
-    }
-
-  cycleTerritory = () => {
-    if (this.stone) {
-      this.groupMembers.forEach(pt => pt.territory = pt.territory * -1);
-    } else {
-      this.groupMembers.forEach(pt => {
-        switch (pt.territory) {
-        case 1:
-          pt.territory = -1;
-          break;
-        case -1:
-          pt.territory = 'd';
-          break;
-        case 'd':
-          pt.territory = 1;
-          break;
-        }
-      });
-    }
-  }
-}
-
-
-function clearKo(Game) {
-  for (let point in Game.boardState) {
-    point = Game.boardState[point];
-    point.stone = point.stone === 'k' ? 0 : point.stone;
-  }
-}
-
-function clearPass(Game) {
-  Game.pass = 0;
-}
-
-function resolveCaptures(point, Game) {
-  if(!point.capturing.length) {
-    point.checkCapture(Game);
-  }
-  if(point.capturing.length) {
-    point.capturing.forEach(cap => {
-      Game.playerState[gameState.turn > 0 ? 'bCaptures' : 'wCaptures']++;
-      cap.stone = checkKo(point) ? 'k' : 0;
-      cap.groupMembers = [];
-    })
-  }
-}
-
-function checkLegal(point, Game) {
-  // clearOverlay();
-  // first step in logic: is point occupied, or in ko
-  if (point.stone) return 0;
-  // if point is not empty check if liberties
-  if (point.getLiberties(Game).length < 1) {
-    //if no liberties check if enemy group has liberties
-    if ( point.checkCapture(Game).length ) return 'l';
-    //if neighboring point is not empty check if friendly group is alive
-    if (point.checkGroup(Game)) return 'l';
-    return 0;
-  }
-  return 'l';
-}
-
-function clearOverlay() {
-  for (let point in boardState) {
-    point = boardState[point];
-    point.legal = false;
-  }
-}
-
-function checkKo(point) { // currently prevents snapback // capturing point has no liberties and is only capturing one stone and 
-  if (!point.getLiberties().length && point.capturing.length === 1 && !point.checkNeighbors().some(stone => stone.stone === gameState.turn)) return true;
-}
-
-
-function clearCaptures(Game) {
-  for (let point in Game.boardState) {
-    point = Game.boardState[point];
-    point.capturing = [];
-  }
-}
-
-function playerPass() {
-  // display confirmation message
-  clearKo();
-  clearCaptures();
-  gameState.gameRecord.push(`${STONES_DATA[gameState.turn]}: pass`)
-  gameState.pass++;
-  if (gameState.pass === 2) return endGame();
-  gameState.turn*= -1;
-}
-
-
-/*----- endgame functions -----*/
-
-function playerResign() {
-  // display confirmation message
-  gameState.pass = -1;
-}
-
-function clickGameHud() {
-  if (gameState.pass > 1 && !gameState.winner) calculateWinner();
-  if (gameState.pass < 0) confirmResign();
-}
-
-function confirmResign() {
-  gameState.gameRecord.push(`${STONES_DATA[gameState.turn]}: resign`);
-  gameState.winner = STONES_DATA[gameState.turn * -1];
-  endGame();
-}
-
-function endGame() {
-  if (!gameState.winner) endGameSetTerritory()
-}
-
-function calculateWinner() {
-  let whiteTerritory = boardState.reduce((acc, pt) => {
-    if (pt.territory === -1 && pt.stone !== -1) {
-      return acc = acc + (pt.stone === 0 ? 1 : 2);
-    }
-    return acc;
-  }, 0);
-  let blackTerritory = boardState.reduce((acc, pt) => {
-    if (pt.territory === 1 && pt.stone !== 1) {
-      return acc + (pt.stone === 0 ? 1 : 2);
-    }
-    return acc;
-  }, 0);
-  gameState.playerState.wScore =
-    gameState.playerState.wCaptures
-    + (gameState.komi < 0 ? gameState.komi * -1 : 0)
-    + whiteTerritory;
-  gameState.playerState.bScore =
-    gameState.playerState.bCaptures
-    + (gameState.komi > 0 ? gameState.komi : 0)
-    + blackTerritory;
-  gameState.winner = gameState.playerState.wScore > gameState.playerState.bScore ? -1 : 1;
-  gameState.gameRecord.push(`${STONES_DATA[gameState.winner]}: +${Math.abs(gameState.playerState.wScore - gameState.playerState.bScore)}`)
-}
-
-function endGameSetTerritory() {
-  let emptyPoints = boardState.filter(pt => !pt.stone);
-  emptyPoints.forEach(pt => pt.joinGroup());
-  emptyPointSetTerritory(emptyPoints);
-  groupsMarkDeadLive();
-}
-
-function groupsMarkDeadLive() {
-  boardState.filter(pt => (!pt.territory ))
-    .forEach(pt => {
-      if (pt.groupMembers.some(grpMem => {
-        return grpMem.checkNeighbors().some(nbr => nbr.territory === pt.stone && nbr.stone === 0)
-      })) {
-        pt.groupMembers.forEach(grpMem => grpMem.territory = pt.stone);
-      }
-    });
-  boardState.filter(pt => (!pt.territory)).forEach(pt => {
-    pt.territory = pt.stone * -1;
-  });  
-}
-
-function emptyPointSetTerritory(emptyPoints) {
-  emptyPoints.filter(pt => !pt.territory && pt.checkNeighbors().filter(nbr => nbr.stone !== 0))
-    .forEach(pt => {
-      let b = pt.groupMembers.reduce((acc, grpMem) => {
-        let bNbr = grpMem.checkNeighbors().filter(nbr => nbr.stone === 1).length;
-        return acc + bNbr;
-      }, 0);
-      let w = pt.groupMembers.reduce((acc, grpMem) => {
-        let wNbr = grpMem.checkNeighbors().filter(nbr => nbr.stone === -1).length;
-        return acc + wNbr;
-      }, 0);
-      pt.groupMembers.forEach(grp => {
-        if (Math.abs(b - w) < 4 && b && w) grp.territory = 'd'
-        else grp.territory = b > w ? 1 : -1;
-      })
-    });
-}
-
-module.exports = {
-  Game
-}

packages/server/services/gameServices.js

@@ -1,157 +1,33 @@
-const Game = require("./Game").Game;
+const Game = require('./Game').Game;
 
-const GameService = ({ moveQueries, gameQueries }) => {
+const gamesInProgress = { }
-  const storeGame = (game) => {
-    gamesInProgress[game.id] = Game(game);
-    return gamesInProgress[game.id];
-  };
-  const gamesInProgress = {};
 
-  const storeMove = (gameId) => async ({ player, pos: { x, y } }) => {
+const storeGame = (game) => {
-    let move = { player, pos: { x, y } };
+  gamesInProgress[game.id] = new Game(game);
-    try {
+}
-      if (moveQueries) {
-        const { id } = await moveQueries.addMove({
-          gameId,
-          player,
-          x,
-          y,
-          gameRecord: true,
-          priorMove: null,
-        });
-        move.id = id;
-        move.success = true;
-      }
-    } catch (e) {
-      console.log(e);
-      move.success = false;
-    } finally {
-      return move;
-    }
-  };
 
-  return {
+const initGame = (game) => {
-    initGame({ id, gameRecord = [], ...gameData }) {
+  gamesInProgress[game.id] = new Game(game)
-      if (gamesInProgress[id]) return this.getDataForUI(id);
+  return gamesInProgress[game.id].initGame();
-      if (gameRecord.length) {
+}
-        gamesInProgress[id] = Game({ gameData, gameRecord });
-      } else {
-        gamesInProgress[id] = Game({ gameData }).initGame();
-      }
-      return this.getDataForUI(id);
-    },
 
-    async makeMove({ id, move }) {
+const makeMove = (game, move) => {
-      // check cache
+  if (!gamesInProgress[game.id]) initGame(game);
-      if (!gamesInProgress[id]) {
+  const newState = gamesInProgress[game.id].makeMove(move);
-        try {
+  return {...newState}
-          let gameRecord;
+}
-          if (moveQueries) {
-            gameRecord = await moveQueries.findGameRecord(id);
-          }
-          storeGame({ id, gameRecord }).initGame();
-        } catch {
-          return { message: "error restoring game" };
-        }
-      }
-      gamesInProgress[id] = await gamesInProgress[id].checkMove(move);
-      gamesInProgress[id] = gamesInProgress[id].makeMove(move);
-      if (gamesInProgress[id].success === false)
-        return { message: "illegal move" };
-      try {
-        if (moveQueries) {
-          const priorMove = gamesInProgress[id].gameRecord.length;
-          const moveInsert = {
-            gameId: id,
-            player: move.player,
-            x: move.pos.x,
-            y: move.pos.y,
-            gameRecord: true,
-            priorMove,
-          };
-          let moveDbResult;
-          moveDbResult = await moveQueries.addMove(moveInsert);
-        }
-      } catch {
-        gamesInProgress[id].returnToMove(-1);
-      } finally {
-        return this.getDataForUI(id);
-      }
-    },
 
-    getDataForUI: (id) => {
+const getBoard = (gameId) => {
-      return {
+  return gamesInProgress[gameId].getBoardState();
-        board: gamesInProgress[id].legalMoves,
+}
-        territory: gamesInProgress[id].territory,
-        ...gamesInProgress[id].getMeta(),
-      };
-    },
 
-    dropGame: (id) => {
+const getAllGames = () => {
-      return { message: `${delete gamesInProgress[id]}` };
+  return gamesInProgress;
-    },
+}
 
-    getAllGames: () => {
+module.exports = {
-      return gamesInProgress;
+  makeMove,
-    },
+  getAllGames,
-
+  getBoard,
-    resign: ({ id, player }) => {
+  initGame
-      // add resign gamesQueries
+}
-      return gamesInProgress[id].submitResign(player).getMeta();
-    },
-
-    async pass({ id, player }) {
-      gamesInProgress[id] = gamesInProgress[id].submitPass(player);
-      if (gamesInProgress[id].success === false)
-        return { message: "illegal move" };
-      try {
-        if (moveQueries) {
-          const priorMove = gamesInProgress[id].gameRecord.length;
-          const movePass = {
-            gameId: id,
-            player,
-            x: 0,
-            y: 0,
-            gameRecord: true,
-            priorMove,
-          };
-          let moveDbResult;
-          moveDbResult = await moveQueries.addMove(movePass);
-        }
-      } catch {
-        gamesInProgress[id].returnToMove(-1);
-      } finally {
-        return this.getDataForUI(id);
-      }
-    },
-
-    toggleTerritory({ id, point }) {
-      gamesInProgress[id] = gamesInProgress[id].toggleTerritory(point);
-      return this.getDataForUI(id);
-    },
-
-    async endGame({ id }) {
-      gamesInProgress[id] = gamesInProgress[id].endGame();
-      const { winner, score, playerState } = gamesInProgress[id];
-      const { bCaptures, wCaptures } = playerState;
-      const winType = winner > 0 ? "B+" : "W+";
-      try {
-        if (gameQueries) {
-          const result = await gameQueries.endGame({
-            id,
-            winType,
-            score,
-            bCaptures,
-            wCaptures,
-          });
-          console.log(result);
-        }
-      } catch (e) {
-        console.log(e);
-      }
-      return this.getDataForUI(id);
-    },
-  };
-};
-
-module.exports = GameService;

packages/server/services/guestServices.js

@@ -1,25 +0,0 @@
-const generateRandomPassword = () => {
-  const minLength = 8,
-    maxLength = 16,
-    minUTF = 33,
-    maxUTF = 126;
-  const randomize = (min, max) => Math.floor(Math.random() * (max - min) + min);
-  return Array(randomize(minLength, maxLength))
-    .fill(0)
-    .map(() => String.fromCharCode(randomize(minUTF, maxUTF)))
-    .join("");
-};
-
-const guestService = {
-  currentGuest: 0,
-  generateGuest() {
-    // generate unique username
-    const username = `Guest-${String(this.currentGuest++).padStart(6, 0)}`;
-    // generate random "password"
-    // this exists solely to add extra randomness to signed token and is not validated
-    const password = generateRandomPassword();
-    return { username, password };
-  },
-};
-
-module.exports = guestService;

packages/server/socket.js

@@ -1,157 +1,53 @@
-// TODO const someSocketLogic = require('./middleware/sockets/...');
+// TODO const someSocketLogic = require('./middleware/socketssockets/...');
-const socketIO = require("socket.io");
+const socketIO = require('socket.io');
 const io = socketIO({ cookie: false });
 
-// const gameQueries = require('./data/queries/game');
+const gameQueries = require('./data/queries/game');
-const moveQueries = require("./data/queries/move");
+const gameServices = require('./services/gameServices');
-const gameQueries = require("./data/queries/game");
-const gameServices = require("./services/gameServices")({
-  moveQueries,
-  gameQueries,
-});
 
-io.on("connection", async (socket) => {
+io.on('connection', socket=> {
-  socket.emit("connected", { message: "socket connected" });
+  socket.emit('connected', {message: 'socket connected'});
-  socket.on("connect_room", async (data) => {
+  socket.on('connect_room', data => {
     if (data.user && data.user.email) {
       delete data.user.email;
     }
-    const room = data.room;
+    const room= data.room;
     const roomIo = io.of(room);
-    roomIo.on("connection", async (socket) => {
+    roomIo.on('connection', socket => {
-      socket.emit("connected");
+      socket.emit('connected')
-      socket.emit("new_user", data);
+      socket.emit('new_user', data);
-      socket.on("connect_game", (data) => {
+      socket.on('connect_game', data => {
         const game = `game-${data.game.id}`;
         socket.join(game, async () => {
-          // TODO move this logic into game service
+          // ! temp 
-          const gameData = await gameQueries.findGameById(data.game.id);
+          gameServices.initGame({id: data.game.id})
-          const convertWinType = (winType) => {
+          // ! end-temp
-            if (winType.includes("B")) return 1;
+          const gameData = await gameServices.getBoard(data.game.id);
-            if (winType.includes("W")) return -1;
+          io.of(room).to(game).emit('game_connected', gameData)
-            if (winType.includes("0")) return "D";
-            return "?";
-          };
-          gameData.winner = gameData.win_type
-            ? convertWinType(gameData.win_type)
-            : 0;
-          const gameRecord = await moveQueries.findGameRecord(data.game.id);
-          await gameServices.initGame({
-            id: data.game.id,
-            gameRecord,
-            gameData,
-          });
-          const { board, ...meta } = await gameServices.getDataForUI(
-            data.game.id
-          );
-          io.of(room).to(game).emit("game_connected", { board, meta });
         });
       });
+      socket.on('make_move', data => {
         
-      // MAKE MOVE
-      socket.on("make_move", async (data) => {
         const { user, move, board, game, room } = data;
         const gameNsp = `game-${data.game.id}`;
-        try {
-          const { board, message, ...meta } = await gameServices.makeMove({
-            id: data.game.id,
-            move,
-          });
-          const socketAction = message ? "error" : "update_board";
-          socket.join(gameNsp, () => {
-            io.of(room)
-              .to(gameNsp)
-              .emit(socketAction, { board, meta, message });
-          });
-        } catch (e) {
-          console.log(e);
-          socket.join(gameNsp, () => {
-            io.of(room).to(gameNsp).emit("error", e);
-          });
-        }
-      });
         
-      // RESIGN
-      socket.on("resign", async ({ game, player }) => {
-        const { id, room } = game;
-        const gameNsp = `game-${id}`;
         try {
-          const meta = await gameServices.resign({
+          const updatedBoard = gameServices.makeMove(1, move);
-            id,
-            player,
-          });
           socket.join(gameNsp, () => {
-            io.of(room).to(gameNsp).emit("game_resign", meta);
+            io.of(room).to(gameNsp).emit('update_board', updatedBoard)
           });
-        } catch (e) {
-          console.log(e);
         }
-      });
+        catch (err) {
+          socket.join(gameNsp, () => {
+            io.of(room).to(gameNsp).emit('error', err)
+          });
 
-      // PASS
-      socket.on("pass", async ({ game, player }) => {
-        const { id, room } = game;
-        const gameNsp = `game${id}`;
-        try {
-          const {
-            board,
-            message,
-            territory,
-            ...meta
-          } = await gameServices.pass({
-            id,
-            player,
-          });
-          socket.join(gameNsp, () => {
-            io.of(room)
-              .to(gameNsp)
-              .emit("update_board", { board, message, territory, meta });
-          });
-        } catch (e) {
-          console.log(e);
         }
-      });
+      })
-
-      // TOGGLE TERRITORY
-      socket.on("toggle_territory", async ({ user, point, board, game }) => {
-        const { id, room } = game;
-        const gameNsp = `game${id}`;
-        try {
-          const {
-            board,
-            territory,
-            ...meta
-          } = await gameServices.toggleTerritory({
-            id,
-            point,
-          });
-          socket.join(gameNsp, () => {
-            io.of(room)
-              .to(gameNsp)
-              .emit("update_board", { board, territory, meta });
-          });
-        } catch (e) {
-          console.log(e);
-        }
-      });
-
-      // END GAME
-      socket.on("end_game", async ({ user, game }) => {
-        const { id, room } = game;
-        const gameNsp = `game${id}`;
-        try {
-          const { board, ...meta } = await gameServices.endGame({ id });
-          socket.join(gameNsp, () => {
-            io.of(room).to(gameNsp).emit("end_game", { board, meta });
-          });
-        } catch (e) {
-          console.log(e);
-        }
-      });
     });
-  });
+  })
-});
+})
 
 module.exports = {
-  io,
+  io
-};
+}

packages/server/test/gameServices.spec.js

@@ -1,434 +1,69 @@
-const chai = require("chai");
+const chai = require('chai');
 const should = chai.should();
-const gameServices = require("../services/gameServices")({});
+const gameServices = require('../services/gameServices');
 
-describe("game services", () => {
+describe('game services', () => {
-  afterEach(() => gameServices.dropGame(1));
+  it('init game returns game board', done => {
-
+    gameServices.initGame({id: 1, handicap: 4})
-  it("init game returns game board", (done) => {
+    gameServices.getBoard(1).should.eql(fourHandicapBoard)
-    gameServices
-      .initGame({ id: 1, handicap: 4 })
-      .board.should.eql(fourHandicapBoard);
     done();
   });
   
-  it("init game returns game metadata", (done) => {
+  it('games services places move', done => {
-    const { board, ...game } = gameServices.initGame({ id: 1, handicap: 4 });
+    gameServices.initGame({id: 1, handicap: 4})
-    game.should.eql({ ...initialMeta, handicap: 4, turn: -1, territory: {} });
+    const afterMoveOne = gameServices.makeMove({id: 1}, {player: 'white', pos: { x:6, y:3 }});
+    const afterMoveOneShould = { board:{ ...fourHandicapBoard, '6-3': -1}, meta: moveOneMeta };
+    afterMoveOne.should.eql(afterMoveOneShould);
     done();
   });
   
-  it("games services places move", async () => {
+  it('illegal move throws error', done => {
-    gameServices.initGame({ id: 1, handicap: 4 });
+    try {
-    const move = { player: "white", pos: { x: 6, y: 3 } };
+      gameServices.initGame({id: 1, handicap: 4})
-    const afterMove = await gameServices.makeMove({ id: 1, move });
+      const afterIllegalMove = gameServices.makeMove({id: 1}, {player: 'white', pos: { x:4, y:4 }});
-    const afterMoveShould = {
+    }
-      board: { ...fourHandicapBoard, "6-3": -1 },
+    catch (err) { 
-      ...initialMeta,
+      err.message.should.equal('illegal move')
-      handicap: 4,
+      done();
-      turn: 1,
+    }
-      gameRecord: [move],
+  })
-      territory: {},
-    };
-    afterMove.should.eql(afterMoveShould);
-  });
 
-  it("illegal move returns error message", async () => {
+})
-    gameServices.initGame({ id: 1, handicap: 4 });
-    const afterMove = await gameServices.makeMove({
-      id: 1,
-      move: { player: "white", pos: { x: 4, y: 4 } },
-    });
-    afterMove.message.should.equal("illegal move");
-  });
 
-  it("game services places move next to stone", async () => {
-    gameServices.initGame({ id: 1, handicap: 4 });
-    const afterMove = await gameServices.makeMove({
-      id: 1,
-      move: { player: "white", pos: { x: 4, y: 3 } },
-    });
-    afterMove.board.should.eql({ ...fourHandicapBoard, "4-3": -1 });
-  });
-});
 
 const fourHandicapBoard = {
-  "1-1": "l",
+  '1-1': 'l','1-2': 'l','1-3': 'l','1-4': 'l','1-5': 'l','1-6': 'l','1-7': 'l','1-8': 'l','1-9': 'l','1-10': 'l','1-11': 'l','1-12': 'l','1-13': 'l','1-14': 'l','1-15': 'l','1-16': 'l','1-17': 'l','1-18': 'l','1-19': 'l',
-  "1-2": "l",
+  '2-1': 'l','2-2': 'l','2-3': 'l','2-4': 'l','2-5': 'l','2-6': 'l','2-7': 'l','2-8': 'l','2-9': 'l','2-10': 'l','2-11': 'l','2-12': 'l','2-13': 'l','2-14': 'l','2-15': 'l','2-16': 'l','2-17': 'l','2-18': 'l','2-19': 'l',
-  "1-3": "l",
+  '3-1': 'l','3-2': 'l','3-3': 'l','3-4': 'l','3-5': 'l','3-6': 'l','3-7': 'l','3-8': 'l','3-9': 'l','3-10': 'l','3-11': 'l','3-12': 'l','3-13': 'l','3-14': 'l','3-15': 'l','3-16': 'l','3-17': 'l','3-18': 'l','3-19': 'l',
-  "1-4": "l",
+  '4-1': 'l','4-2': 'l','4-3': 'l','4-4': 1,'4-5': 'l','4-6': 'l','4-7': 'l','4-8': 'l','4-9': 'l','4-10': 'l','4-11': 'l','4-12': 'l','4-13': 'l','4-14': 'l','4-15': 'l','4-16': 1,'4-17': 'l','4-18': 'l','4-19': 'l',
-  "1-5": "l",
+  '5-1': 'l','5-2': 'l','5-3': 'l','5-4': 'l','5-5': 'l','5-6': 'l','5-7': 'l','5-8': 'l','5-9': 'l','5-10': 'l','5-11': 'l','5-12': 'l','5-13': 'l','5-14': 'l','5-15': 'l','5-16': 'l','5-17': 'l','5-18': 'l','5-19': 'l',
-  "1-6": "l",
+  '6-1': 'l','6-2': 'l','6-3': 'l','6-4': 'l','6-5': 'l','6-6': 'l','6-7': 'l','6-8': 'l','6-9': 'l','6-10': 'l','6-11': 'l','6-12': 'l','6-13': 'l','6-14': 'l','6-15': 'l','6-16': 'l','6-17': 'l','6-18': 'l','6-19': 'l',
-  "1-7": "l",
+  '7-1': 'l','7-2': 'l','7-3': 'l','7-4': 'l','7-5': 'l','7-6': 'l','7-7': 'l','7-8': 'l','7-9': 'l','7-10': 'l','7-11': 'l','7-12': 'l','7-13': 'l','7-14': 'l','7-15': 'l','7-16': 'l','7-17': 'l','7-18': 'l','7-19': 'l',
-  "1-8": "l",
+  '8-1': 'l','8-2': 'l','8-3': 'l','8-4': 'l','8-5': 'l','8-6': 'l','8-7': 'l','8-8': 'l','8-9': 'l','8-10': 'l','8-11': 'l','8-12': 'l','8-13': 'l','8-14': 'l','8-15': 'l','8-16': 'l','8-17': 'l','8-18': 'l','8-19': 'l',
-  "1-9": "l",
+  '9-1': 'l','9-2': 'l','9-3': 'l','9-4': 'l','9-5': 'l','9-6': 'l','9-7': 'l','9-8': 'l','9-9': 'l','9-10': 'l','9-11': 'l','9-12': 'l','9-13': 'l','9-14': 'l','9-15': 'l','9-16': 'l','9-17': 'l','9-18': 'l','9-19': 'l',
-  "1-10": "l",
+  '10-1': 'l','10-2': 'l','10-3': 'l','10-4': 'l','10-5': 'l','10-6': 'l','10-7': 'l','10-8': 'l','10-9': 'l','10-10': 'l','10-11': 'l','10-12': 'l','10-13': 'l','10-14': 'l','10-15': 'l','10-16': 'l','10-17': 'l','10-18': 'l','10-19': 'l',
-  "1-11": "l",
+  '11-1': 'l','11-2': 'l','11-3': 'l','11-4': 'l','11-5': 'l','11-6': 'l','11-7': 'l','11-8': 'l','11-9': 'l','11-10': 'l','11-11': 'l','11-12': 'l','11-13': 'l','11-14': 'l','11-15': 'l','11-16': 'l','11-17': 'l','11-18': 'l','11-19': 'l',
-  "1-12": "l",
+  '12-1': 'l','12-2': 'l','12-3': 'l','12-4': 'l','12-5': 'l','12-6': 'l','12-7': 'l','12-8': 'l','12-9': 'l','12-10': 'l','12-11': 'l','12-12': 'l','12-13': 'l','12-14': 'l','12-15': 'l','12-16': 'l','12-17': 'l','12-18': 'l','12-19': 'l',
-  "1-13": "l",
+  '13-1': 'l','13-2': 'l','13-3': 'l','13-4': 'l','13-5': 'l','13-6': 'l','13-7': 'l','13-8': 'l','13-9': 'l','13-10': 'l','13-11': 'l','13-12': 'l','13-13': 'l','13-14': 'l','13-15': 'l','13-16': 'l','13-17': 'l','13-18': 'l','13-19': 'l',
-  "1-14": "l",
+  '14-1': 'l','14-2': 'l','14-3': 'l','14-4': 'l','14-5': 'l','14-6': 'l','14-7': 'l','14-8': 'l','14-9': 'l','14-10': 'l','14-11': 'l','14-12': 'l','14-13': 'l','14-14': 'l','14-15': 'l','14-16': 'l','14-17': 'l','14-18': 'l','14-19': 'l',
-  "1-15": "l",
+  '15-1': 'l','15-2': 'l','15-3': 'l','15-4': 'l','15-5': 'l','15-6': 'l','15-7': 'l','15-8': 'l','15-9': 'l','15-10': 'l','15-11': 'l','15-12': 'l','15-13': 'l','15-14': 'l','15-15': 'l','15-16': 'l','15-17': 'l','15-18': 'l','15-19': 'l',
-  "1-16": "l",
+  '16-1': 'l','16-2': 'l','16-3': 'l','16-4': 1,'16-5': 'l','16-6': 'l','16-7': 'l','16-8': 'l','16-9': 'l','16-10': 'l','16-11': 'l','16-12': 'l','16-13': 'l','16-14': 'l','16-15': 'l','16-16': 1,'16-17': 'l','16-18': 'l','16-19': 'l',
-  "1-17": "l",
+  '17-1': 'l','17-2': 'l','17-3': 'l','17-4': 'l','17-5': 'l','17-6': 'l','17-7': 'l','17-8': 'l','17-9': 'l','17-10': 'l','17-11': 'l','17-12': 'l','17-13': 'l','17-14': 'l','17-15': 'l','17-16': 'l','17-17': 'l','17-18': 'l','17-19': 'l',
-  "1-18": "l",
+  '18-1': 'l','18-2': 'l','18-3': 'l','18-4': 'l','18-5': 'l','18-6': 'l','18-7': 'l','18-8': 'l','18-9': 'l','18-10': 'l','18-11': 'l','18-12': 'l','18-13': 'l','18-14': 'l','18-15': 'l','18-16': 'l','18-17': 'l','18-18': 'l','18-19': 'l',
-  "1-19": "l",
+  '19-1': 'l','19-2': 'l','19-3': 'l','19-4': 'l','19-5': 'l','19-6': 'l','19-7': 'l','19-8': 'l','19-9': 'l','19-10': 'l','19-11': 'l','19-12': 'l','19-13': 'l','19-14': 'l','19-15': 'l','19-16': 'l','19-17': 'l','19-18': 'l','19-19': 'l'
-  "2-1": "l",
-  "2-2": "l",
-  "2-3": "l",
-  "2-4": "l",
-  "2-5": "l",
-  "2-6": "l",
-  "2-7": "l",
-  "2-8": "l",
-  "2-9": "l",
-  "2-10": "l",
-  "2-11": "l",
-  "2-12": "l",
-  "2-13": "l",
-  "2-14": "l",
-  "2-15": "l",
-  "2-16": "l",
-  "2-17": "l",
-  "2-18": "l",
-  "2-19": "l",
-  "3-1": "l",
-  "3-2": "l",
-  "3-3": "l",
-  "3-4": "l",
-  "3-5": "l",
-  "3-6": "l",
-  "3-7": "l",
-  "3-8": "l",
-  "3-9": "l",
-  "3-10": "l",
-  "3-11": "l",
-  "3-12": "l",
-  "3-13": "l",
-  "3-14": "l",
-  "3-15": "l",
-  "3-16": "l",
-  "3-17": "l",
-  "3-18": "l",
-  "3-19": "l",
-  "4-1": "l",
-  "4-2": "l",
-  "4-3": "l",
-  "4-4": 1,
-  "4-5": "l",
-  "4-6": "l",
-  "4-7": "l",
-  "4-8": "l",
-  "4-9": "l",
-  "4-10": "l",
-  "4-11": "l",
-  "4-12": "l",
-  "4-13": "l",
-  "4-14": "l",
-  "4-15": "l",
-  "4-16": 1,
-  "4-17": "l",
-  "4-18": "l",
-  "4-19": "l",
-  "5-1": "l",
-  "5-2": "l",
-  "5-3": "l",
-  "5-4": "l",
-  "5-5": "l",
-  "5-6": "l",
-  "5-7": "l",
-  "5-8": "l",
-  "5-9": "l",
-  "5-10": "l",
-  "5-11": "l",
-  "5-12": "l",
-  "5-13": "l",
-  "5-14": "l",
-  "5-15": "l",
-  "5-16": "l",
-  "5-17": "l",
-  "5-18": "l",
-  "5-19": "l",
-  "6-1": "l",
-  "6-2": "l",
-  "6-3": "l",
-  "6-4": "l",
-  "6-5": "l",
-  "6-6": "l",
-  "6-7": "l",
-  "6-8": "l",
-  "6-9": "l",
-  "6-10": "l",
-  "6-11": "l",
-  "6-12": "l",
-  "6-13": "l",
-  "6-14": "l",
-  "6-15": "l",
-  "6-16": "l",
-  "6-17": "l",
-  "6-18": "l",
-  "6-19": "l",
-  "7-1": "l",
-  "7-2": "l",
-  "7-3": "l",
-  "7-4": "l",
-  "7-5": "l",
-  "7-6": "l",
-  "7-7": "l",
-  "7-8": "l",
-  "7-9": "l",
-  "7-10": "l",
-  "7-11": "l",
-  "7-12": "l",
-  "7-13": "l",
-  "7-14": "l",
-  "7-15": "l",
-  "7-16": "l",
-  "7-17": "l",
-  "7-18": "l",
-  "7-19": "l",
-  "8-1": "l",
-  "8-2": "l",
-  "8-3": "l",
-  "8-4": "l",
-  "8-5": "l",
-  "8-6": "l",
-  "8-7": "l",
-  "8-8": "l",
-  "8-9": "l",
-  "8-10": "l",
-  "8-11": "l",
-  "8-12": "l",
-  "8-13": "l",
-  "8-14": "l",
-  "8-15": "l",
-  "8-16": "l",
-  "8-17": "l",
-  "8-18": "l",
-  "8-19": "l",
-  "9-1": "l",
-  "9-2": "l",
-  "9-3": "l",
-  "9-4": "l",
-  "9-5": "l",
-  "9-6": "l",
-  "9-7": "l",
-  "9-8": "l",
-  "9-9": "l",
-  "9-10": "l",
-  "9-11": "l",
-  "9-12": "l",
-  "9-13": "l",
-  "9-14": "l",
-  "9-15": "l",
-  "9-16": "l",
-  "9-17": "l",
-  "9-18": "l",
-  "9-19": "l",
-  "10-1": "l",
-  "10-2": "l",
-  "10-3": "l",
-  "10-4": "l",
-  "10-5": "l",
-  "10-6": "l",
-  "10-7": "l",
-  "10-8": "l",
-  "10-9": "l",
-  "10-10": "l",
-  "10-11": "l",
-  "10-12": "l",
-  "10-13": "l",
-  "10-14": "l",
-  "10-15": "l",
-  "10-16": "l",
-  "10-17": "l",
-  "10-18": "l",
-  "10-19": "l",
-  "11-1": "l",
-  "11-2": "l",
-  "11-3": "l",
-  "11-4": "l",
-  "11-5": "l",
-  "11-6": "l",
-  "11-7": "l",
-  "11-8": "l",
-  "11-9": "l",
-  "11-10": "l",
-  "11-11": "l",
-  "11-12": "l",
-  "11-13": "l",
-  "11-14": "l",
-  "11-15": "l",
-  "11-16": "l",
-  "11-17": "l",
-  "11-18": "l",
-  "11-19": "l",
-  "12-1": "l",
-  "12-2": "l",
-  "12-3": "l",
-  "12-4": "l",
-  "12-5": "l",
-  "12-6": "l",
-  "12-7": "l",
-  "12-8": "l",
-  "12-9": "l",
-  "12-10": "l",
-  "12-11": "l",
-  "12-12": "l",
-  "12-13": "l",
-  "12-14": "l",
-  "12-15": "l",
-  "12-16": "l",
-  "12-17": "l",
-  "12-18": "l",
-  "12-19": "l",
-  "13-1": "l",
-  "13-2": "l",
-  "13-3": "l",
-  "13-4": "l",
-  "13-5": "l",
-  "13-6": "l",
-  "13-7": "l",
-  "13-8": "l",
-  "13-9": "l",
-  "13-10": "l",
-  "13-11": "l",
-  "13-12": "l",
-  "13-13": "l",
-  "13-14": "l",
-  "13-15": "l",
-  "13-16": "l",
-  "13-17": "l",
-  "13-18": "l",
-  "13-19": "l",
-  "14-1": "l",
-  "14-2": "l",
-  "14-3": "l",
-  "14-4": "l",
-  "14-5": "l",
-  "14-6": "l",
-  "14-7": "l",
-  "14-8": "l",
-  "14-9": "l",
-  "14-10": "l",
-  "14-11": "l",
-  "14-12": "l",
-  "14-13": "l",
-  "14-14": "l",
-  "14-15": "l",
-  "14-16": "l",
-  "14-17": "l",
-  "14-18": "l",
-  "14-19": "l",
-  "15-1": "l",
-  "15-2": "l",
-  "15-3": "l",
-  "15-4": "l",
-  "15-5": "l",
-  "15-6": "l",
-  "15-7": "l",
-  "15-8": "l",
-  "15-9": "l",
-  "15-10": "l",
-  "15-11": "l",
-  "15-12": "l",
-  "15-13": "l",
-  "15-14": "l",
-  "15-15": "l",
-  "15-16": "l",
-  "15-17": "l",
-  "15-18": "l",
-  "15-19": "l",
-  "16-1": "l",
-  "16-2": "l",
-  "16-3": "l",
-  "16-4": 1,
-  "16-5": "l",
-  "16-6": "l",
-  "16-7": "l",
-  "16-8": "l",
-  "16-9": "l",
-  "16-10": "l",
-  "16-11": "l",
-  "16-12": "l",
-  "16-13": "l",
-  "16-14": "l",
-  "16-15": "l",
-  "16-16": 1,
-  "16-17": "l",
-  "16-18": "l",
-  "16-19": "l",
-  "17-1": "l",
-  "17-2": "l",
-  "17-3": "l",
-  "17-4": "l",
-  "17-5": "l",
-  "17-6": "l",
-  "17-7": "l",
-  "17-8": "l",
-  "17-9": "l",
-  "17-10": "l",
-  "17-11": "l",
-  "17-12": "l",
-  "17-13": "l",
-  "17-14": "l",
-  "17-15": "l",
-  "17-16": "l",
-  "17-17": "l",
-  "17-18": "l",
-  "17-19": "l",
-  "18-1": "l",
-  "18-2": "l",
-  "18-3": "l",
-  "18-4": "l",
-  "18-5": "l",
-  "18-6": "l",
-  "18-7": "l",
-  "18-8": "l",
-  "18-9": "l",
-  "18-10": "l",
-  "18-11": "l",
-  "18-12": "l",
-  "18-13": "l",
-  "18-14": "l",
-  "18-15": "l",
-  "18-16": "l",
-  "18-17": "l",
-  "18-18": "l",
-  "18-19": "l",
-  "19-1": "l",
-  "19-2": "l",
-  "19-3": "l",
-  "19-4": "l",
-  "19-5": "l",
-  "19-6": "l",
-  "19-7": "l",
-  "19-8": "l",
-  "19-9": "l",
-  "19-10": "l",
-  "19-11": "l",
-  "19-12": "l",
-  "19-13": "l",
-  "19-14": "l",
-  "19-15": "l",
-  "19-16": "l",
-  "19-17": "l",
-  "19-18": "l",
-  "19-19": "l",
 };
 
-const initialMeta = {
+const moveOneMeta = {
-  winner: null,
+  gameRecord: [
-  turn: 0,
+    {player: 'white', pos: { x:6, y:3 }}
+  ],
   pass: 0,
-  komi: 6.5,
-  handicap: 0,
-  boardSize: 19,
   playerState: {
     bCaptures: 0,
-    wCaptures: 0,
     bScore: 0,
-    wScore: 0,
+    wCaptures: 0,
+    wScore: 0
   },
-  gameRecord: [],
+  turn: 1,
-  score: 0,
+  winner: null
-};
+}