nav fixes
This commit is contained in:
parent
36f260a811
commit
2560ce992d
@ -205,7 +205,6 @@
|
|||||||
position: absolute;
|
position: absolute;
|
||||||
top: 50%;
|
top: 50%;
|
||||||
left: 50%;
|
left: 50%;
|
||||||
text-align: center;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
CRYP DAMAGE
|
CRYP DAMAGE
|
||||||
|
|||||||
@ -47,7 +47,7 @@ function Main(props) {
|
|||||||
if (nav === 'list') return <List />;
|
if (nav === 'list') return <List />;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Team />
|
<main></main>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -16,6 +16,8 @@ const addState = connect(
|
|||||||
} = state;
|
} = state;
|
||||||
|
|
||||||
function sendInstanceState(instance) {
|
function sendInstanceState(instance) {
|
||||||
|
ws.clearGameStateTimeout();
|
||||||
|
ws.clearInstanceStateTimeout();
|
||||||
return ws.sendInstanceState(instance.id);
|
return ws.sendInstanceState(instance.id);
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -63,8 +65,14 @@ function Nav(args) {
|
|||||||
setTestInstance,
|
setTestInstance,
|
||||||
} = args;
|
} = args;
|
||||||
|
|
||||||
|
function joinInstance(i) {
|
||||||
|
navTo(null);
|
||||||
|
sendInstanceState(i);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
const joined = instances.map(i => (
|
const joined = instances.map(i => (
|
||||||
<button key={i.id} onClick={() => sendInstanceState(i)} >{i.name}</button>
|
<button key={i.id} onClick={() => joinInstance(i)} >{i.name}</button>
|
||||||
));
|
));
|
||||||
|
|
||||||
const teamElements = team.map((c, i) => {
|
const teamElements = team.map((c, i) => {
|
||||||
|
|||||||
@ -101,6 +101,7 @@ function registerEvents(store) {
|
|||||||
|
|
||||||
function setAccount(account) {
|
function setAccount(account) {
|
||||||
store.dispatch(actions.setAccount(account));
|
store.dispatch(actions.setAccount(account));
|
||||||
|
store.dispatch(actions.setNav('team'));
|
||||||
}
|
}
|
||||||
|
|
||||||
function clearCombiner() {
|
function clearCombiner() {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user