diff --git a/website/src/Users/UserForm.js b/website/src/Users/UserForm.js index 2c89459..e2be202 100644 --- a/website/src/Users/UserForm.js +++ b/website/src/Users/UserForm.js @@ -3,8 +3,9 @@ import PropTypes from 'prop-types' import { reactAutoBind } from 'auto-bind2' import { regExpPattern } from 'regexp-pattern' import { api } from 'src/API' -import { Column, BoundInput, BoundButton, BoundCheckbox, BoundEmailIcon } from 'ui' +import { Row, Column, BoundInput, BoundButton, BoundCheckbox, BoundEmailIcon } from 'ui' import { FormBinder } from 'react-form-binder' +import { sizeInfo } from 'ui/style' export class UserForm extends React.Component { static propTypes = { @@ -28,15 +29,19 @@ export class UserForm extends React.Component { nonValue: true, isDisabled: (r) => (!!r._id === false) }, + resendEmail: { + nonValue: true, + isDisabled: (r) => (!!r._id === false) + }, firstName: { isValid: (r, v) => (v !== '') }, lastName: { isValid: (r, v) => (v !== '') }, - role: { + administrator: { isValid: (r, v) => (v !== ''), - isDisabled: (r) => (api.loggedInUser._id === r._id) + isDisabled: (r) => (api.loggedInUser._id === r._id) // Adding a new user }, project: { isValid: (r, v) => (v !== '' || v === '') @@ -99,40 +104,79 @@ export class UserForm extends React.Component { } render() { - return ( -