Ver Fonte

Small fixes

niels há 5 anos atrás
pai
commit
7325aaa5dc

+ 3 - 3
frontend/keezen-frontend/src/Game.js

@@ -30,7 +30,7 @@ export default function Game({ message, swapCard, playCard, confirmPlay, undoPla
             break;
         case SiteState.PLAY_CARD_OTHER:
             card = play_card;
-            text = `${current_player.color}(${current_player.name}) is een kaart aan het kiezen`;
+            text = `${current_player.color}(${current_player.name}) is een kaart aan het spelen`;
             break;
     }
 
@@ -40,10 +40,10 @@ export default function Game({ message, swapCard, playCard, confirmPlay, undoPla
         {card &&
         <Card value={card}/>
         }
-        {card && play_card &&
+        {card && play_card && state === SiteState.PLAY_CARD &&
         <button className="btn btn-primary" onClick={confirmPlay}>Bevestig</button>
         }
-        {card &&
+        {card && (state === SiteState.PLAY_CARD || state === SiteState.SWAP_CARD) &&
         <button className="btn btn-danger" onClick={undoPlay}>Neem terug</button>
         }
         <Hand cards={hand} play={play}/>

+ 5 - 2
frontend/keezen-frontend/src/Hand.js

@@ -5,10 +5,13 @@ export default function Hand({ cards, play }) {
     const [selected, setSelected] = useState(null);
 
     return <div className="hand">
-        {cards.map((c, i) => <Card value={c}
+        <div className="row">
+        {cards.map((c, i) => <div className="col-2">
+            <Card value={c}
                                    animate={play !== null}
                                    play={play === null ? null : (() => play(c))}
                                    select={selected === i ? () => setSelected(null) : () => setSelected(i)}
-                                   selected={selected === i}/>)}
+                                                      selected={selected === i}/></div>)}
+        </div>
     </div>
 }

+ 1 - 1
frontend/keezen-frontend/src/css/Card.css

@@ -19,7 +19,7 @@
     align-content: flex-start;
 
     padding: 20px;
-    margin: 70px 20px -150px;
+    margin: 70px 0 -150px;
     transition: margin-top 500ms ease;
 }
 

+ 1 - 1
game.py

@@ -146,7 +146,7 @@ class Game(object):
         for other in self.players:
             if other.color != player.color:
                 other.message = f"{player.name} speelt een {card.denom}"
-                other.state = StateCode.PLAY_CARD_OTHER,
+                other.state = StateCode.PLAY_CARD_OTHER
                 other.play_card = card