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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Mashy
2019-05-31 13:27:47 +10:00
parent 6295d8888e d6a3ca2eb4
commit c7ee7361dd
15 changed files with 111 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/info.component.jsx
+1 -4
View File
@@ -11,12 +11,9 @@ function InfoComponent(args) {
itemInfo,
combiner,
instance,
account,
player,
} = args;
const player = instance.players.find(p => p.id === account.id);
function Info() {
if (!info) return false;
const fullInfo = itemInfo.items.find(i => i.item === info) || INFO[info];
client/src/components/info.container.jsx
+2
View File
@@ -11,6 +11,7 @@ const addState = connect(
info,
itemInfo,
instance,
player,
account,
} = state;
@@ -20,6 +21,7 @@ const addState = connect(
info,
itemInfo,
instance,
player,
account,
};
},
client/src/components/instance.component.jsx
+1 -2
View File
@@ -10,8 +10,7 @@ const actions = require('../actions');
const addState = connect(
function receiveState(state) {
const { ws, instance, account, nav } = state;
const player = instance.players.find(p => p.id === account.id);
const { ws, instance, player, account, nav } = state;
function sendInstanceReady() {
return ws.sendInstanceReady(instance.id);
client/src/components/instance.constructs.jsx
+1 -2
View File
@@ -8,8 +8,7 @@ const actions = require('../actions');
const addState = connect(
function receiveState(state) {
const { ws, instance, account, itemInfo, itemEquip, activeConstruct } = state;
const player = instance.players.find(p => p.id === account.id);
const { ws, instance, player, account, itemInfo, itemEquip, activeConstruct } = state;
function sendInstanceReady() {
return ws.sendInstanceReady(instance.id);
client/src/components/instance.equip.jsx
+1 -2
View File
@@ -8,8 +8,7 @@ const { convertItem } = require('./../utils');
const addState = connect(
function receiveState(state) {
const { account, activeConstruct, itemInfo, info, ws, instance, itemUnequip } = state;
const player = instance.players.find(p => p.id === account.id);
const { account, activeConstruct, itemInfo, info, ws, instance, player, itemUnequip } = state;
function sendUnequip(constructId, item) {
return ws.sendVboxUnequip(instance.id, constructId, item);
client/src/components/login.component.jsx
-45
View File
@@ -1,45 +0,0 @@
// eslint-disable-next-line
const preact = require('preact');
function renderLogin({ submitLogin, submitRegister }) {
const details = {
name: '',
password: '',
};
return (
<main>
<div className="login">
<input
className="login-input"
type="email"
placeholder="username"
onInput={e => (details.name = e.target.value)}
/>
<input
className="login-input"
type="password"
placeholder="password"
onInput={e => (details.password = e.target.value)}
/>
<button
className="login-btn"
onClick={() => submitLogin(details.name, details.password)}>
Login
</button>
<button
className="login-btn"
onClick={() => submitRegister(details.name, details.password)}>
Register
</button>
<button
className="login-btn"
onClick={() => document.location.assign('https://discord.gg/YJJgurM')}>
Discord + Invites
</button>
</div>
</main>
);
}
module.exports = renderLogin;
client/src/components/login.container.jsx
-19
View File
@@ -1,19 +0,0 @@
const { connect } = require('preact-redux');
const Login = require('./login.component');
const addState = connect(
(state) => {
const { ws, account } = state;
function submitLogin(name, password) {
return ws.sendAccountLogin(name, password);
}
function submitRegister(name, password) {
console.log(name, password);
return ws.sendAccountCreate(name, password);
}
return { account, submitLogin, submitRegister };
},
);
module.exports = addState(Login);
client/src/components/login.jsx
+93
View File
@@ -0,0 +1,93 @@
// eslint-disable-next-line
const preact = require('preact');
const { Component } = require('preact')
const { connect } = require('preact-redux');
const addState = connect(
(state) => {
const { ws, account } = state;
function submitLogin(name, password) {
return ws.sendAccountLogin(name, password);
}
function submitRegister(name, password) {
console.log(name, password);
return ws.sendAccountCreate(name, password);
}
return { account, submitLogin, submitRegister };
},
);
class Login extends Component {
constructor(props) {
super(props);
this.state = { name: '', password: '' };
this.nameInput = this.nameInput.bind(this);
this.passwordInput = this.passwordInput.bind(this);
this.loginSubmit = this.loginSubmit.bind(this);
this.registerSubmit = this.registerSubmit.bind(this);
}
nameInput(event) {
console.log(event.target.value);
this.setState({ name: event.target.value });
}
passwordInput(event) {
this.setState({ password: event.target.value });
}
loginSubmit(event) {
event.preventDefault();
console.log(this.state);
this.props.submitLogin(this.state.name, this.state.password);
this.setState({ name: '', password: '' });
}
registerSubmit(event) {
event.preventDefault();
this.props.submitRegister(this.state.name, this.state.password);
console.log(this.state);
this.setState({ name: '', password: '' });
}
render() {
return (
<main>
<div className="login">
<input
className="login-input"
type="email"
placeholder="username"
onInput={this.nameInput}
/>
<input
className="login-input"
type="password"
placeholder="password"
onInput={this.passwordInput}
/>
<button
className="login-btn"
onClick={this.loginSubmit}>
Login
</button>
<button
className="login-btn"
onClick={this.registerSubmit}>
Register
</button>
<button
className="login-btn"
onClick={() => document.location.assign('https://discord.gg/YJJgurM')}>
Discord + Invites
</button>
</div>
</main>
);
}
}
module.exports = addState(Login);
client/src/components/main.jsx
+4 -2
View File
@@ -2,7 +2,7 @@
const preact = require('preact');
const { connect } = require('preact-redux');
const LoginContainer = require('./login.container');
const Login = require('./login');
const GameContainer = require('./game.container');
const Instance = require('./instance.component');
const Team = require('./team');
@@ -24,7 +24,7 @@ function Main(props) {
} = props;
if (!account) {
return <LoginContainer />;
return <Login />;
}
if (game) {
@@ -35,6 +35,8 @@ function Main(props) {
return <Instance />;
}
console.warn('nav', nav, instance, game)
if (nav === 'team') return <Team />;
if (nav === 'list') return <List />;
client/src/components/vbox.component.jsx
+1 -3
View File
@@ -10,16 +10,14 @@ const addState = connect(
function receiveState(state) {
const {
ws,
account,
instance,
player,
combiner,
reclaiming,
vboxHighlight,
itemInfo,
} = state;
const player = instance.players.find(p => p.id === account.id);
function sendVboxDiscard() {
return ws.sendVboxDiscard(instance.id);
}