diff --git a/app/assets/javascripts/components/game.js.jsx b/app/assets/javascripts/components/game.js.jsx
index 9f665fe..c150d76 100644
--- a/app/assets/javascripts/components/game.js.jsx
+++ b/app/assets/javascripts/components/game.js.jsx
@@ -9,7 +9,6 @@ var Game = React.createClass({
getInitialState: function() {
return {
- //id: 0,
players: [],
title: ""
};
@@ -38,8 +37,9 @@ var Game = React.createClass({
Title: {this.state.title}
Id: {this.props.id}
+
Current Player: {this.props.current_player}
diff --git a/app/assets/javascripts/components/inventory.js.jsx b/app/assets/javascripts/components/inventory.js.jsx
index be4fcde..e2b9364 100644
--- a/app/assets/javascripts/components/inventory.js.jsx
+++ b/app/assets/javascripts/components/inventory.js.jsx
@@ -30,7 +30,7 @@ var Inventory = React.createClass({
return
;
diff --git a/app/assets/javascripts/components/player.js.jsx b/app/assets/javascripts/components/player.js.jsx
index 50ebf67..10fddc5 100644
--- a/app/assets/javascripts/components/player.js.jsx
+++ b/app/assets/javascripts/components/player.js.jsx
@@ -33,7 +33,8 @@ var Player = React.createClass({
Id: {this.props.id}
Email: {this.props.email}
Inventory count: {this.props.inventory_count}
-
+
+
);
}
@@ -63,9 +64,10 @@ var PlayerList = React.createClass({
// },
render: function() {
+ var playerList = this;
var playerNodes = this.props.players.map(function (player) {
return (
-
+
);
});
//
diff --git a/app/assets/javascripts/components/player_controls.js.jsx b/app/assets/javascripts/components/player_controls.js.jsx
new file mode 100644
index 0000000..4606f3e
--- /dev/null
+++ b/app/assets/javascripts/components/player_controls.js.jsx
@@ -0,0 +1,20 @@
+var PlayerControls = React.createClass({
+
+ render: function() {
+ return (
+
+
Game Id: {this.props.game_id}
+
+
+ );
+ }
+});
diff --git a/app/views/games/show.html.haml b/app/views/games/show.html.haml
index b7c073d..b85030a 100644
--- a/app/views/games/show.html.haml
+++ b/app/views/games/show.html.haml
@@ -1,5 +1,6 @@
-= react_component 'Game', source: "#{game_path @game}.json"
+= react_component 'Game', id: @game.id, current_player: @game.current_player.id, source: "#{game_path @game}.json"
+-# TODO: Remove deprecated commented out code
-#%p
%b Status:
= @game.status
diff --git a/spec/features/plays_spec.rb b/spec/features/plays_spec.rb
index a24a94c..fa4c3b3 100644
--- a/spec/features/plays_spec.rb
+++ b/spec/features/plays_spec.rb
@@ -29,7 +29,8 @@ feature 'Play a hand', type: :feature, js: true do
# Play the highest card
@card_to_play = @player.inventory.last
check @card_to_play.to_s
- click_button 'Play Hand'
+ #click_button 'Play Hand'
+ click_button "play_hand_button_#{@player.id}"
expect(page).to have_content "First hand must contain the lowest card: #{@game.lowest_card.to_s}"
# No play to beat, because play was invalid