ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix few bugs

Browse Source
This commit is contained in:
ntr 2019-10-15 10:00:42 +11:00
parent 349c74c08e
commit f2a516b5f0
7 changed files with 30 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
WORKLOG.md
View File

@ -3,12 +3,8 @@
*PRODUCTION* *PRODUCTION*
* mobile styles * fix purge bug
* mobile info page * add recipe book
* fix info page for tablet layout
* Add TOS and accept to register page
* can't reset password without knowing password =\ * can't reset password without knowing password =\

1
client/assets/styles/game.less
View File

@ -205,7 +205,6 @@
.resolving-skill { .resolving-skill {
grid-area: target; grid-area: target;
align-self: center; align-self: center;
text-align: center;
height: auto; height: auto;
svg { svg {
display: inline; display: inline;

2
client/src/app.jsx
View File

@ -30,7 +30,6 @@ const store = createStore(
window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__(), window.__REDUX_DEVTOOLS_EXTENSION__ && window.__REDUX_DEVTOOLS_EXTENSION__(),
); );
document.fonts.load('16pt "Jura"').then(() => {
const events = registerEvents(store); const events = registerEvents(store);
// store.subscribe(() => console.log(store.getState())); // store.subscribe(() => console.log(store.getState()));
setupKeys(store); setupKeys(store);
@ -49,4 +48,3 @@ document.fonts.load('16pt "Jura"').then(() => {
// eslint-disable-next-line // eslint-disable-next-line
preact.render(<App />, document.body); preact.render(<App />, document.body);
});

3
client/src/components/game.ctrl.btns.top.jsx
View File

@ -49,9 +49,10 @@ function GameCtrlTopBtns(args) {
}; };
const abandonClasses = `abandon ${abandonState ? 'confirming' : ''}`; const abandonClasses = `abandon ${abandonState ? 'confirming' : ''}`;
const abandonText = abandonState ? 'Confirm' : 'Abandon';
const abandonAction = abandonState ? sendAbandon : abandonStateTrue; const abandonAction = abandonState ? sendAbandon : abandonStateTrue;
const abandonBtn = <button class={abandonClasses} disabled={finished} onClick={abandonAction}>Abandon</button>; const abandonBtn = <button class={abandonClasses} disabled={finished} onClick={abandonAction}>{abandonText}</button>;
const leaveBtn = <button class='abandon confirming' onClick={leave}>Leave</button>; const leaveBtn = <button class='abandon confirming' onClick={leave}>Leave</button>;
return ( return (

3
client/src/components/instance.ctrl.top.btns.jsx
View File

@ -49,9 +49,10 @@ function InstanceTopBtns(args) {
}; };
const abandonClasses = `abandon ${abandonState ? 'confirming' : ''}`; const abandonClasses = `abandon ${abandonState ? 'confirming' : ''}`;
const abandonText = abandonState ? 'Confirm' : 'Abandon';
const abandonAction = abandonState ? sendAbandon : abandonStateTrue; const abandonAction = abandonState ? sendAbandon : abandonStateTrue;
const abandonBtn = <button class={abandonClasses} disabled={finished} onClick={abandonAction}>Abandon</button>; const abandonBtn = <button class={abandonClasses} disabled={finished} onClick={abandonAction}>{abandonText}</button>;
const leaveBtn = <button class='abandon confirming' onClick={leave}>Leave</button>; const leaveBtn = <button class='abandon confirming' onClick={leave}>Leave</button>;
return ( return (

2
client/src/components/vbox.component.jsx
View File

@ -248,12 +248,14 @@ function Vbox(args) {
function onClick(e) { function onClick(e) {
if (vboxSelecting) clearVboxSelected(); if (vboxSelecting) clearVboxSelected();
if (reclaiming) return sendVboxReclaim(i); if (reclaiming) return sendVboxReclaim(i);
if (combiner.length > 2) return combinerChange([i]);
const combinerIndex = combiner.indexOf(i); const combinerIndex = combiner.indexOf(i);
if (combinerIndex > -1) { if (combinerIndex > -1) {
return combinerChange(without(combiner, i)); return combinerChange(without(combiner, i));
} }
combiner.push(i); combiner.push(i);
return combinerChange(combiner); return combinerChange(combiner);
} }