- {console.log("Hello from player_list.jsx")}
- {console.log(this.props.onPlayHandSubmit)}
+
{this.state.data.title}
{/* TODO: DEPRECATED seats are now rendered within games */}
diff --git a/app/assets/stylesheets/game.css.sass b/app/assets/stylesheets/game.css.sass
index 019903a..382fe8c 100644
--- a/app/assets/stylesheets/game.css.sass
+++ b/app/assets/stylesheets/game.css.sass
@@ -103,6 +103,20 @@ button
flex: 0 0 100%
align-self: flex-end
+////// Cards to beat
+
+ol#cards-to-beat
+ display: flex
+ flex-wrap: wrap
+ text-align: center
+ li
+ flex: 1 1 auto
+ img
+ width: 6vmin
+ border: 1px solid black
+ border-radius: .3vmin
+
+
////// Inventory
.player form
diff --git a/app/assets/stylesheets/tables.css.scss b/app/assets/stylesheets/tables.css.scss
index ea3e587..0c519cc 100644
--- a/app/assets/stylesheets/tables.css.scss
+++ b/app/assets/stylesheets/tables.css.scss
@@ -1,3 +1,10 @@
// Place all the styles related to the Tables controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
+
+#table-component-container-container,
+#table-component-container,
+.table {
+ width: 100%;
+ height: 100%;
+}
diff --git a/app/views/games/show.json.jbuilder b/app/views/games/show.json.jbuilder
index c136e61..35e067e 100644
--- a/app/views/games/show.json.jbuilder
+++ b/app/views/games/show.json.jbuilder
@@ -1,8 +1,10 @@
json.extract! @game, :id, :title, :created_at, :updated_at, :controlling_player_id
if @game.controlling_player_id == @game.player_to_beat.try(:id)
json.play_to_beat_string "None"
+ json.cards_to_beat []
else
json.play_to_beat_string @game.play_to_beat.try(:play).try(:to_s)
+ json.cards_to_beat @game.play_to_beat.try(:play).try(:player_cards)
end
json.winner_player_id @game.winner_player_id
diff --git a/spec/features/tables/table_show_spec.rb b/spec/features/tables/table_show_spec.rb
index 0e3fb57..15bf470 100644
--- a/spec/features/tables/table_show_spec.rb
+++ b/spec/features/tables/table_show_spec.rb
@@ -53,7 +53,7 @@ feature 'Table show', :devise do
#TODO: Fix race condition
visit table_path @table
#TODO: Write a better expectation
- expect(page).to have_content "Hand to beat"
+ expect(page).to have_content "Inventory"
end
end