jketreno/peddlers-of-ketran
1
0
Fork 0
Code Issues 42 Activity

Fix #120

Browse Source 
Separate who frmo text in Activities

Signed-off-by: James Ketrenos <james_eikona@ketrenos.com>
This commit is contained in:
James Ketrenos 2022-06-18 19:54:59 -07:00
parent b21f29cec5
commit 4c33dfcdf1
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
client/src/Activities.css
View File

@ -16,6 +16,10 @@
height: 5.2em; height: 5.2em;
} }
.Activities .Who {
margin-right: 0.25rem;
}
.Activities .PlayerColor { .Activities .PlayerColor {
display: inline-flex; display: inline-flex;
width: 1rem; width: 1rem;

4
client/src/Activities.js
View File

@ -145,7 +145,7 @@ const Activities = () => {
selectResources = turn && turn.actions && turn.actions.indexOf('select-resources') !== -1; selectResources = turn && turn.actions && turn.actions.indexOf('select-resources') !== -1;
console.log(`activities - `, state, turn, activities); console.log(`activities - `, state, turn, activities);
let discarders = [], mustDiscard = false; let discarders = [], mustDiscard = false;
for (let key in players) { for (let key in players) {
const player = players[key]; const player = players[key];
@ -172,7 +172,7 @@ const Activities = () => {
name: color === key ? 'You' : players[key].name}); name: color === key ? 'You' : players[key].name});
} }
who = selecting.map((player, index) => who = selecting.map((player, index) =>
<div key={index}><PlayerColor color={player.color} />{ player.name }{ index !== selecting.length - 1 ? ', ' : '' }</div>); <div className="Who" key={index}><PlayerColor color={player.color} />{ player.name }{ index !== selecting.length - 1 ? ', ' : '' }</div>);
} else { } else {
if (isTurn) { if (isTurn) {
who = 'You'; who = 'You';

3
client/src/Hand.js
View File

@ -122,7 +122,7 @@ const Hand = ({buildActive, setBuildActive, setCardActive}) => {
if (count.length !== selected) { if (count.length !== selected) {
setSelected(count.length); setSelected(count.length);
} }
}, [setSelected, selected]); }, [setSelected, selected, turn]);
if (!priv) { if (!priv) {
return <></>; return <></>;
@ -133,7 +133,6 @@ const Hand = ({buildActive, setBuildActive, setCardActive}) => {
setSelected(count.length); setSelected(count.length);
} }
return <div className="Hand"> return <div className="Hand">
{<div className="CardsSelected" {<div className="CardsSelected"
style={selected === 0 ? { display: 'none' } : {}}> style={selected === 0 ? { display: 'none' } : {}}>