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

Allow name change for non-players

Browse Source 
Signed-off-by: James Ketrenos <james_eikona@ketrenos.com>
This commit is contained in:
James Ketrenos 2022-03-25 16:32:31 -07:00
parent b80d95a6b4
commit 0421166bc9
3 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/Actions.js
View File

@ -169,8 +169,8 @@ const Actions = ({tradeActive, setTradeActive, buildActive, setBuildActive}) =>
{ name && inLobby && <> { name && inLobby && <>
<Button disabled={(color && active >= 2) ? false : true } onClick={startClick}>Start game</Button> <Button disabled={(color && active >= 2) ? false : true } onClick={startClick}>Start game</Button>
<Button disabled={color ? false : true} onClick={newTableClick}>New table</Button> <Button disabled={color ? false : true} onClick={newTableClick}>New table</Button>
<Button disabled={color ? true : false} onClick={changeNameClick}>Change name</Button>
</> } </> }
{ name && !color && <Button disabled={color ? true : false} onClick={changeNameClick}>Change name</Button> }
{ name && !inLobby && <> { name && !inLobby && <>
<Button disabled={ <Button disabled={
robberActions || robberActions ||

26
client/src/MediaControl.css
View File

@ -8,6 +8,14 @@
border-radius: 0.25rem; border-radius: 0.25rem;
} }
.MediaControlSpacer.Medium {
width: 11.5em;
height: 8.625em;
min-width: 11.5em;
min-height: 8.625em;
}
.MediaControl { .MediaControl {
display: flex; display: flex;
position: fixed; position: fixed;
@ -25,32 +33,16 @@
position: relative; position: relative;
width: 100%; width: 100%;
height: 100%; height: 100%;
/*
width: 5rem;
height: 3.75rem;
/*
max-width: 5rem;
max-height: 3.75rem;
*/
background-color: #444; background-color: #444;
border-radius: 0.25rem; border-radius: 0.25rem;
border: 1px solid black; border: 1px solid black;
} }
.MediaControl.Medium .Video { .MediaControl.Medium {
/*
display: flex;
width: 11.5em; width: 11.5em;
height: 8.625em; height: 8.625em;
min-width: 11.5em; min-width: 11.5em;
min-height: 8.625em; min-height: 8.625em;
/* width: 9.75rem;
height: 7.3125rem;
max-width: 9.75rem;
max-height: 7.3125rem;*/
background-color: #444;
border-radius: 0.25rem;
border: 1px solid black;
} }
.MediaControl > div { .MediaControl > div {

2
client/src/MediaControl.js
View File

@ -643,7 +643,7 @@ const MediaControl = ({isSelf, peer, className}) => {
} }
return <> return <>
<div className="MediaControlSpacer"/> <div className={`MediaControlSpacer ${className}`}/>
<div className={`MediaControl ${className}`} data-peer={peer.name}> <div className={`MediaControl ${className}`} data-peer={peer.name}>
<div className="Controls" > <div className="Controls" >
{ isSelf && <div onTouchStart={toggleMute} onClick={toggleMute}> { isSelf && <div onTouchStart={toggleMute} onClick={toggleMute}>