From cf1e1b74936e3222814082b42f8af02457dd8e20 Mon Sep 17 00:00:00 2001 From: "Jesse C. Fisher" Date: Sun, 20 Oct 2019 17:26:52 -0700 Subject: [PATCH] Add style for player hand --- app/assets/stylesheets/game.css.sass | 4 ++- app/views/tables/_seat.html.haml | 38 +++++++++++++--------------- app/views/tables/show.html.haml | 22 +++++----------- 3 files changed, 27 insertions(+), 37 deletions(-) diff --git a/app/assets/stylesheets/game.css.sass b/app/assets/stylesheets/game.css.sass index ee48c49..a5d67eb 100644 --- a/app/assets/stylesheets/game.css.sass +++ b/app/assets/stylesheets/game.css.sass @@ -121,7 +121,7 @@ ol#cards-to-beat ////// Inventory -.player form +.player ul#inventory display: flex flex-wrap: wrap @@ -142,3 +142,5 @@ ol#cards-to-beat width: 6vmin border: 1px solid black border-radius: .3vmin + + diff --git a/app/views/tables/_seat.html.haml b/app/views/tables/_seat.html.haml index 92db7fe..c95a5dd 100644 --- a/app/views/tables/_seat.html.haml +++ b/app/views/tables/_seat.html.haml @@ -12,25 +12,23 @@ - if seat.player .player .user-name= seat.player.display_name - - if @game.started? - %h1 hi - .inventory-count= seat.player.inventory.count + - if @game.started? + .inventory-count= seat.player.inventory.count - -# Show player controls if player is owned by current_user - - if seat.player.soft_token = current_user.soft_token - = form_for @game, play_hand_game_path do |f| - %ul#inventory - - seat.player.inventory.each do |card| - %li - %label - %input{form: "player_controls_" + card.player_id, - type: "checkbox", - name: "player_card_ids[]", - data: {card_name: card.rank.gsub('11','J') .gsub('12','Q') .gsub('13','K') .gsub('14','A') .gsub('15','2') + ' ' + card.suit}, value: card.id} - %img{src: "/assets/cards/png/" + (card.rank.gsub('J','jack').gsub('Q','queen').gsub('K','king').gsub('A','ace') + '_of_' + card.suit.downcase + "s.png").gsub('11','jack') .gsub('12','queen') .gsub('13','king') .gsub('14','ace') .gsub('15','2') } - -# = image_tag("hi") + -# Show player controls if player is owned by current_user + - if seat.player.soft_token == current_user.soft_token + = form_for(@game,url: play_hand_game_path) do |f| + %ul#inventory + - seat.player.inventory.each do |card| + %li + %label + %input{form: "player_controls_" + card.player_id.to_s, + type: "checkbox", + name: "player_card_ids[]", + data: {card_name: card.rank.gsub('11','J') .gsub('12','Q') .gsub('13','K') .gsub('14','A') .gsub('15','2') + ' ' + card.suit}, value: card.id} + %img{src: "/assets/cards/png/" + (card.rank.gsub('J','jack').gsub('Q','queen').gsub('K','king').gsub('A','ace') + '_of_' + card.suit.downcase + "s.png").gsub('11','jack') .gsub('12','queen') .gsub('13','king') .gsub('14','ace') .gsub('15','2') } - %input{type: "submit", value: "Play Hand", name: "commit"} - -# %input{type: "submit", value: "Pass", name: "pass"} - = f.submit "Pass" - + %input{type: "submit", value: "Play Hand", name: "commit"} + -# %input{type: "submit", value: "Pass", name: "pass"} + = f.submit "Pass" + diff --git a/app/views/tables/show.html.haml b/app/views/tables/show.html.haml index 82983d8..006620f 100644 --- a/app/views/tables/show.html.haml +++ b/app/views/tables/show.html.haml @@ -71,19 +71,9 @@ #game-component %h1= @game.title - - if @game.started? - - else - %section#game-controls - -# TODO: If not joinable, show why. i.e. game full - -# TODO: DEPRECATED use seat sit instead this.state.data.is_joinable ? : null - -# TODO: If not startable, show why. i.e. need more players - -# - if @game.can_accomodate(current_user) - = button_to "Join", join_game_path(@game) - - - #playerList - #top - = render "seat", seat: @seats[0] - #mid - = render "seat", seat: @seats[1] - + #playerList + #top + = render "seat", seat: @seats[0] + #mid + = render "seat", seat: @seats[1] +