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

Merge branch 'release/1.12.2' of ssh://git.mnml.gg:40022/~/mnml into release/1.12.2

Browse Source
This commit is contained in:
Mashy 2020-01-17 17:20:49 +10:00
commit f52d2e409a
4 changed files with 19 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,6 @@ section {
font-size: 1.5em;
display: flex;
flex-flow: column;
height: 5em;
}
letter-spacing: 0.25em;

16
client/src/components/play.jsx
View File

@ -221,13 +221,15 @@ function Play(args) {
<div>
<h1 class="credits">¤ {account.balance}</h1>
<div class='list'>
{subscription}
<button
onClick={() => setNav('shop')}
class="yellow-btn"
role="link">
Get Credits
</button>
<figure>{subscription}</figure>
<figure>
<button
onClick={() => setNav('shop')}
class="yellow-btn"
role="link">
Get Credits
</button>
</figure>
</div>
<div>
Join our Discord server to find opponents and talk to the devs. <br />

20
client/src/components/reshape.jsx
View File

@ -106,19 +106,19 @@ function Reshape(args) {
<div>
<h1 class="credits">¤ {account.balance}</h1>
<div class='list'>
{subscription}
<button
onClick={() => setNav('shop')}
class="yellow-btn"
role="link">
Get Credits
</button>
<div id="error-message"></div>
</div>
<div class='list'>
<figure>{subscription}</figure>
<figure>
<button
onClick={() => setNav('shop')}
class="yellow-btn"
role="link">
Get Credits
</button>
</figure>
{shop.owned.map(useMtx)}
{shop.available.map(availableMtx)}
</div>
<div id="error-message"></div>
</div>
</section>
);

4
client/src/events.jsx
View File

@ -107,7 +107,6 @@ function registerEvents(store) {
}
function setAuthenticated(account) {
if (account && window.Notification) {
window.Notification.requestPermission();
}
@ -116,9 +115,6 @@ function registerEvents(store) {
LogRocket.identify(account.id, account);
}
const { tutorial, ws } = store.getState();
if (tutorial) ws.sendInstancePractice();
store.dispatch(actions.setAccount(account));
store.dispatch(actions.setAuthenticated(true));
}