john/deighton-ar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tweaks

Browse Source
This commit is contained in:
John Lyon-Smith
2018-06-05 15:35:46 -07:00
parent 3d0f1392ea
commit e60801ec3e
3 changed files with 25 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
website/src/Auth/ResetPassword.js
View File

@@ -123,7 +123,7 @@ export class ResetPassword extends Component {
<Row.Item grow /> <Row.Item grow />
<Row.Item width={sizeInfo.formRowSpacing} /> <Row.Item width={sizeInfo.formRowSpacing} />
<Row.Item width={sizeInfo.modalWidth}> <Row.Item width={sizeInfo.modalWidth}>
<form onSubmit={this.handleSubmit} id="resetPasswordForm"> <form onSubmit={this.handleSubmit} id="ResetPasswordForm">
<Box <Box
border={{ border={{
width: sizeInfo.headerBorderWidth, width: sizeInfo.headerBorderWidth,
@@ -178,7 +178,7 @@ export class ResetPassword extends Component {
<BoundButton <BoundButton
text="Submit" text="Submit"
name="submit" name="submit"
submit="resetPasswordForm" submit="ResetPasswordForm"
binder={binder} binder={binder}
/> />
</Row.Item> </Row.Item>

6
website/src/Modal/ChangePasswordModal.js
View File

@@ -49,6 +49,8 @@ export class ChangePasswordModal extends React.Component {
@autobind @autobind
handleSubmit(e) { handleSubmit(e) {
e.preventDefault() e.preventDefault()
e.stopPropagation()
let passwords = null let passwords = null
const { binder } = this.state const { binder } = this.state
@@ -70,7 +72,7 @@ export class ChangePasswordModal extends React.Component {
return ( return (
<Modal open={this.props.open} width={sizeInfo.modalWidth}> <Modal open={this.props.open} width={sizeInfo.modalWidth}>
<form id="changePasswordForm" onSubmit={this.handleSubmit}> <form id="ChangePasswordForm" onSubmit={this.handleSubmit}>
<Row> <Row>
<Row.Item width={sizeInfo.formRowSpacing} /> <Row.Item width={sizeInfo.formRowSpacing} />
<Row.Item grow> <Row.Item grow>
@@ -122,7 +124,7 @@ export class ChangePasswordModal extends React.Component {
<Row.Item> <Row.Item>
<BoundButton <BoundButton
text="Submit" text="Submit"
submit="changePasswordForm" submit="ChangePasswordForm"
name="submit" name="submit"
binder={binder} binder={binder}
/> />

30
website/src/Modal/MessageModal.js
View File

@@ -1,8 +1,8 @@
import React from 'react' import React from "react"
import PropTypes from 'prop-types' import PropTypes from "prop-types"
import { Modal, Button, Column, Row, Text, Icon } from 'ui' import { Modal, Button, Column, Row, Text, Icon } from "ui"
import { sizeInfo } from 'ui/style' import { sizeInfo } from "ui/style"
import autobind from 'autobind-decorator' import autobind from "autobind-decorator"
export class MessageModal extends React.Component { export class MessageModal extends React.Component {
static propTypes = { static propTypes = {
@@ -10,7 +10,7 @@ export class MessageModal extends React.Component {
icon: PropTypes.string.isRequired, icon: PropTypes.string.isRequired,
message: PropTypes.string.isRequired, message: PropTypes.string.isRequired,
detail: PropTypes.string, detail: PropTypes.string,
onDismiss: PropTypes.func onDismiss: PropTypes.func,
} }
@autobind @autobind
@@ -30,26 +30,34 @@ export class MessageModal extends React.Component {
return ( return (
<Modal open={open} width={sizeInfo.modalWidth}> <Modal open={open} width={sizeInfo.modalWidth}>
<form onSubmit={this.onSubmit} id='messageModal'> <form onSubmit={this.onSubmit} id="MessageForm">
<Row> <Row>
<Row.Item> <Row.Item>
<Icon name={icon} size={sizeInfo.modalMessageIcon} /> <Icon name={icon} size={sizeInfo.modalMessageIcon} />
</Row.Item> </Row.Item>
<Row.Item grow> <Row.Item grow>
<Column height='100%'> <Column height="100%">
<Column.Item height={sizeInfo.formColumnSpacing} /> <Column.Item height={sizeInfo.formColumnSpacing} />
<Column.Item grow> <Column.Item grow>
<Text width='100%' align='center'>{message}</Text> <Text width="100%" align="center">
{message}
</Text>
</Column.Item> </Column.Item>
<Column.Item> <Column.Item>
<Text width='100%' align='center' color='dimmed' size='small'>{detail}</Text> <Text width="100%" align="center" color="dimmed" size="small">
{detail}
</Text>
</Column.Item> </Column.Item>
<Column.Item height={sizeInfo.formColumnSpacing} /> <Column.Item height={sizeInfo.formColumnSpacing} />
<Column.Item height={sizeInfo.buttonHeight}> <Column.Item height={sizeInfo.buttonHeight}>
<Row> <Row>
<Row.Item grow /> <Row.Item grow />
<Row.Item> <Row.Item>
<Button submit='messageModal' text='OK' onClick={this.onSubmit} /> <Button
submit="MessageForm"
text="OK"
onClick={this.onSubmit}
/>
</Row.Item> </Row.Item>
<Row.Item grow /> <Row.Item grow />
</Row> </Row>