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; font-size: 1.5em;
display: flex; display: flex;
flex-flow: column; flex-flow: column;
height: 5em;
} }
letter-spacing: 0.25em; letter-spacing: 0.25em;

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

@ -221,13 +221,15 @@ function Play(args) {
<div> <div>
<h1 class="credits">¤ {account.balance}</h1> <h1 class="credits">¤ {account.balance}</h1>
<div class='list'> <div class='list'>
{subscription} <figure>{subscription}</figure>
<button <figure>
onClick={() => setNav('shop')} <button
class="yellow-btn" onClick={() => setNav('shop')}
role="link"> class="yellow-btn"
Get Credits role="link">
</button> Get Credits
</button>
</figure>
</div> </div>
<div> <div>
Join our Discord server to find opponents and talk to the devs. <br /> 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> <div>
<h1 class="credits">¤ {account.balance}</h1> <h1 class="credits">¤ {account.balance}</h1>
<div class='list'> <div class='list'>
{subscription} <figure>{subscription}</figure>
<button <figure>
onClick={() => setNav('shop')} <button
class="yellow-btn" onClick={() => setNav('shop')}
role="link"> class="yellow-btn"
Get Credits role="link">
</button> Get Credits
<div id="error-message"></div> </button>
</div> </figure>
<div class='list'>
{shop.owned.map(useMtx)} {shop.owned.map(useMtx)}
{shop.available.map(availableMtx)} {shop.available.map(availableMtx)}
</div> </div>
<div id="error-message"></div>
</div> </div>
</section> </section>
); );

4
client/src/events.jsx
View File

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