Adds combat

package.json

@@ -43,7 +43,7 @@
     "postcss-loader": "2.0.8",
     "promise": "8.0.1",
     "prop-types": "^15.5.10",
-    "pusher-js": "^4.2.1",
+    "pusher-js": "4.4.0",
     "raven-js": "^3.17.0",
     "react": "^16.0.0",
     "react-css-modules": "^4.7.1",
@@ -57,7 +57,6 @@
     "react-error-overlay": "^3.0.0",
     "react-redux": "^5.0.6",
     "redux": "^3.7.2",
-    "redux-logger": "^3.0.6",
     "redux-object": "^0.5.0",
     "redux-thunk": "^2.2.0",
     "replace-in-file": "^3.0.0",

src/App.js

@@ -1,39 +1,50 @@
-import React, { Component } from 'react';
-import CSSModules from 'react-css-modules';
-import { DragDropContext } from 'react-dnd';
-import HTML5Backend from 'react-dnd-html5-backend';
-import TouchBackend from 'react-dnd-touch-backend';
+import React, { Component } from "react";
+import CSSModules from "react-css-modules";
+import { DragDropContext } from "react-dnd";
+import HTML5Backend from "react-dnd-html5-backend";
+import TouchBackend from "react-dnd-touch-backend";
 
-import { droppable } from '~/decorators';
+import { connect, actions } from "~/redux/tools";
+import { droppable } from "~/decorators";
 
-import Board from '~/components/board/Board';
-import WarRoom from '~/components/war-room/WarRoom';
-import PusherClient from '~/components/pusher-client/PusherClient';
+import Board from "~/components/board/Board";
+import WarRoom from "~/components/war-room/WarRoom";
+import Combat from "~/components/combat/Combat";
+import PusherClient from "~/components/pusher-client/PusherClient";
 
-import styles from './app.scss';
+import { selectHouse } from "~/redux/actions/";
 
-function DnDBackend()
-{
-  const is_touch_device = 'ontouchstart' in window || navigator.maxTouchPoints;
+import styles from "./app.scss";
+
+function DnDBackend() {
+  const is_touch_device = "ontouchstart" in window || navigator.maxTouchPoints;
   if (is_touch_device) {
     return TouchBackend;
   }
   return HTML5Backend;
 }
 
+@connect(
+  (state, props) => ({}),
+  actions({ selectHouse })
+)
 @DragDropContext(DnDBackend())
-@droppable("war-room")
+@droppable(["war-room", "combat"])
 @CSSModules(styles)
 class App extends Component {
   componentWillMount() {
-    const params = {}
-    window.location.search.replace('?', '').split('&').forEach(param => {
-      const arr = param.split('=');
-      const key = arr[0]
-      const value = arr[1];
-      params[key] = value;
-    })
+    const params = {};
+    window.location.search
+      .replace("?", "")
+      .split("&")
+      .forEach(param => {
+        const arr = param.split("=");
+        const key = arr[0];
+        const value = arr[1];
+        params[key] = value;
+      });
     this.setState(params);
+    this.props.selectHouse(params.house);
   }
 
   componentDidMount() {
@@ -47,19 +58,25 @@ class App extends Component {
   }
 
   selectHouse = () => {
-    alert('For now, please inform the params house in the url. ex.: https://got-board-react-app.herokuapp.com?game=12&house=greyjoy');
-  }
+    alert(
+      "For now, please inform the params house in the url. ex.: https://got-board-react-app.herokuapp.com?game=12&house=greyjoy"
+    );
+  };
 
   renderWarRoom() {
-    if(this.state.house) {
+    if (this.state.house) {
       return <WarRoom visible={false} house={this.state.house} />;
     }
     const selectHouseStyle = {
-      position: 'absolute',
+      position: "absolute",
       top: 30,
-      left: 30,
-    }
-    return <button style={selectHouseStyle} onClick={this.selectHouse}>Select a House</button>;
+      left: 30
+    };
+    return (
+      <button style={selectHouseStyle} onClick={this.selectHouse}>
+        Select a House
+      </button>
+    );
   }
 
   render() {
@@ -68,11 +85,12 @@ class App extends Component {
         <PusherClient />
         <Board gameId={this.state.game} house={this.state.house} />
         <aside>
-          <div styleName="iron-throne-token"></div>
-          <div styleName="valyrian-steel-blade-token"></div>
-          <div styleName="mensseger-raven-token"></div>
+          <div styleName="iron-throne-token" />
+          <div styleName="valyrian-steel-blade-token" />
+          <div styleName="mensseger-raven-token" />
         </aside>
-        { this.renderWarRoom() }
+        {this.renderWarRoom()}
+        <Combat />
       </div>
     );
   }

src/components/board/Board.js

@@ -1,80 +1,106 @@
-import React from 'react';
-import CSSModules from 'react-css-modules';
-import styles from './Board.scss';
+import React from "react";
+import CSSModules from "react-css-modules";
+import styles from "./Board.scss";
 
-import { connect, build, actions } from '~/redux/tools';
-import { droppable } from '~/decorators';
+import { connect, build, actions } from "~/redux/tools";
+import { droppable } from "~/decorators";
 
-import Map from '~/components/map/Map';
-import WildlingsTrack from '~/components/wildlings-track/WildlingsTrack';
-import Pieces from '~/components/pieces/Pieces';
-import InfluenceTrack from '~/components/influence-track/InfluenceTrack';
-import SupplyTrack from '~/components/supply-track/SupplyTrack';
-import RoundTrack from '~/components/round-track/RoundTrack';
-import VictoryTrack from '~/components/victory-track/VictoryTrack';
-import InfluenceToken from '~/components/influence-token/InfluenceToken';
-import GarrisonToken from '~/components/garrison-token/GarrisonToken';
-import HouseToken from '~/components/house-token/HouseToken';
-import NeutralForceToken from '~/components/neutral-force-token/NeutralForceToken';
-import Orders from '~/components/orders/Orders';
-import WildlingCard from '~/components/wildling-card/WildlingCard';
+import Map from "~/components/map/Map";
+import WildlingsTrack from "~/components/wildlings-track/WildlingsTrack";
+import Pieces from "~/components/pieces/Pieces";
+import InfluenceTrack from "~/components/influence-track/InfluenceTrack";
+import SupplyTrack from "~/components/supply-track/SupplyTrack";
+import RoundTrack from "~/components/round-track/RoundTrack";
+import VictoryTrack from "~/components/victory-track/VictoryTrack";
+import InfluenceToken from "~/components/influence-token/InfluenceToken";
+import GarrisonToken from "~/components/garrison-token/GarrisonToken";
+import HouseToken from "~/components/house-token/HouseToken";
+import NeutralForceToken from "~/components/neutral-force-token/NeutralForceToken";
+import Orders from "~/components/orders/Orders";
+import WildlingCard from "~/components/wildling-card/WildlingCard";
 
-import { fetchGame, updateAll } from '~/redux/actions/';
+import { fetchGame, updateAll } from "~/redux/actions/";
 
 @connect(
   (state, props) => ({
-    game: build(state, 'games', props.gameId) || {},
+    game: build(state, "games", props.gameId) || {},
+    houses: build(state, "houses")
   }),
   actions({ fetchGame, updateAll })
 )
-@droppable('influence-token')
+@droppable("influence-token")
 @CSSModules(styles)
 export default class Board extends React.Component {
   componentDidMount() {
     this.props.fetchGame(this.props.gameId);
   }
 
   drop(monitor) {
-    return  { ...monitor.getDropPosition(), target: 'board' };
+    return { ...monitor.getDropPosition(), target: "board" };
   }
 
-  flipOrders = (revealed) => {
-    const house = this.props.game.houses.find(
-      (house) => house.name === this.props.house
+  flipOrders = revealed => {
+    const house = this.props.houses.find(
+      house => house.name === this.props.house
     );
-    this.props.updateAll(this.props.gameId, 'order', {
-      filter: { house_id: house.id  },
+    this.props.updateAll(this.props.gameId, "order", {
+      filter: { house_id: house.id },
       attributes: { revealed: revealed }
-    })
-  }
+    });
+  };
 
   render() {
     const { connectDropTarget, game, house } = this.props;
-    const { id, round, wildlingThreat }  = game;
-    const territoryFilter = (piece) => piece.territory;
-    const positionFilter = (token) => (token.position === 0);
-    const showStyle = { position: 'fixed', top: 5, left: 90 };
-    const hideStyle = { position: 'fixed', top: 5, left: 190 };
+    const { id, round, wildlingThreat } = game;
+    const territoryFilter = piece => piece.territory;
+    const positionFilter = token => token.position === 0;
+    const showStyle = { position: "fixed", top: 5, left: 90 };
+    const hideStyle = { position: "fixed", top: 5, left: 190 };
 
     return (
       <div styleName="board">
-        <button style={showStyle} onClick={() => this.flipOrders(true)}>Show Orders</button>
-        <button style={hideStyle} onClick={() => this.flipOrders(false)}>Hide Orders</button>
+        <button style={showStyle} onClick={() => this.flipOrders(true)}>
+          Show Orders
+        </button>
+        <button style={hideStyle} onClick={() => this.flipOrders(false)}>
+          Hide Orders
+        </button>
         <WildlingsTrack gameId={id} threat={wildlingThreat} />
         <WildlingCard gameId={id} />
-        { connectDropTarget(
-        <main>
-          <Map />
-          <Pieces piece={InfluenceToken} collection="influenceTokens" filter={positionFilter} />
+        {connectDropTarget(
+          <main>
+            <Map />
+            <Pieces
+              piece={InfluenceToken}
+              collection="influenceTokens"
+              filter={positionFilter}
+            />
 
-          <Pieces piece={HouseToken} collection="units" filter={territoryFilter} />
-          <Pieces piece={HouseToken} collection="powerTokens" type="power-token" filter={territoryFilter} />
+            <Pieces
+              piece={HouseToken}
+              collection="units"
+              filter={territoryFilter}
+            />
+            <Pieces
+              piece={HouseToken}
+              collection="powerTokens"
+              type="power-token"
+              filter={territoryFilter}
+            />
 
-          <Orders houseName={house} filter={territoryFilter} />
+            <Orders houseName={house} filter={territoryFilter} />
 
-          <Pieces piece={GarrisonToken} collection="garrisonTokens" filter={territoryFilter} />
-          <Pieces piece={NeutralForceToken} collection="neutralForceTokens" filter={territoryFilter} />
-        </main>
+            <Pieces
+              piece={GarrisonToken}
+              collection="garrisonTokens"
+              filter={territoryFilter}
+            />
+            <Pieces
+              piece={NeutralForceToken}
+              collection="neutralForceTokens"
+              filter={territoryFilter}
+            />
+          </main>
         )}
         <aside>
           <div styleName="influence-tracks">
@@ -91,6 +117,6 @@ export default class Board extends React.Component {
           </div>
         </aside>
       </div>
-      );
+    );
   }
 }