diff --git a/src/components/dialogs/new-user.js b/src/components/dialogs/new-user.js index a0c1ed0..e711596 100644 --- a/src/components/dialogs/new-user.js +++ b/src/components/dialogs/new-user.js @@ -20,7 +20,7 @@ ******************************************************************************/ import React from 'react'; -import { FormGroup, FormControl, FormLabel, FormText } from 'react-bootstrap'; +import { FormGroup, FormControl, FormLabel, FormText, Col } from 'react-bootstrap'; import Dialog from './dialog'; @@ -33,9 +33,8 @@ class NewUserDialog extends React.Component { this.state = { username: '', mail: '', - role: 'admin', + role: 'User', password: '', - id: 0 }; } @@ -51,65 +50,52 @@ class NewUserDialog extends React.Component { handleChange(e) { this.setState({ [e.target.id]: e.target.value }); + + // check all controls + let username = this.state.username !== '' && this.state.username.length >= 3; + let password = this.state.password !== ''; + let role = this.state.role !== ''; + let mail = this.state.mail !== ''; + + this.valid = username && password && role && mail; + } resetState() { this.setState({ username: '', mail: '', - role: 'admin', + role: 'User', password: '', - id: 0 }); } - validateForm(target) { - // check all controls - let username = this.state.username !== '' && this.state.username.length >= 3; - let password = this.state.password !== ''; - let id = this.state.id !== 0; - - this.valid = username && password && id; - - // return state to control - switch(target) { - case 'username': - return username ? "success" : "error"; - case 'password': - return password ? "success" : "error"; - case 'id': - return id ? "success" : "error"; - default: - return "success"; - } - } - render() { return ( this.onClose(c)} onReset={() => this.resetState()} valid={this.valid}>
- + Username this.handleChange(e)} /> Min 3 characters. - + E-mail this.handleChange(e)} /> - + Password this.handleChange(e)} /> - + Role - this.handleChange(e)}> - - - + this.handleChange(e)}> + + +