@expandorg/app-account
Advanced tools
Comparing version 0.0.11 to 0.0.12
{ | ||
"name": "@expandorg/app-account", | ||
"version": "0.0.11", | ||
"version": "0.0.12", | ||
"description": "App account", | ||
@@ -27,3 +27,3 @@ "main": "index.js", | ||
}, | ||
"gitHead": "76ab5ac4db898ec6cab536e2bb960322763cfd1a" | ||
"gitHead": "8c054286825e2ef640e437e47fb624e00b61c50e" | ||
} |
@@ -14,3 +14,8 @@ import React, { Component } from 'react'; | ||
import { Button, Input, ErrorMessage } from '@expandorg/components'; | ||
import { | ||
Button, | ||
Input, | ||
ErrorMessage, | ||
DialogForm as DF, | ||
} from '@expandorg/components'; | ||
@@ -20,6 +25,4 @@ import { assignAddress } from '../../sagas'; | ||
import styles from '../serviceForms.module.styl'; | ||
import styles from './metamask.module.styl'; | ||
import mstyles from './metamask.module.styl'; | ||
const AssignAddressEffect = submitStateEffect(assignAddressStateSelector); | ||
@@ -93,43 +96,47 @@ | ||
return ( | ||
<div className={styles.container}> | ||
<div className={styles.inner}> | ||
<div className={styles.title}>Change Account Address</div> | ||
<div className={mstyles.metamask}> | ||
<button className={mstyles.assign} onClick={this.handleAssign}> | ||
<ins className={mstyles.fox} /> Use Metamask Address | ||
</button> | ||
{dialog && ( | ||
<MetamaskPromt | ||
metamaskState={metamaskState} | ||
action="Assign address" | ||
headline="" | ||
description="" | ||
onLogin={this.props.assignAddress} | ||
onHide={this.handleHide} | ||
/> | ||
)} | ||
</div> | ||
<div className={styles.description}>Enter address manually</div> | ||
<div className={styles.field}> | ||
<Input | ||
placeholder="Account Address" | ||
value={address} | ||
onChange={this.handleInputChange} | ||
<DF.Container> | ||
<DF.Title>Change Account Address</DF.Title> | ||
<div className={styles.metamask}> | ||
<button className={styles.assign} onClick={this.handleAssign}> | ||
<ins className={styles.fox} /> Use Metamask Address | ||
</button> | ||
{dialog && ( | ||
<MetamaskPromt | ||
metamaskState={metamaskState} | ||
action="Assign address" | ||
headline="" | ||
description="" | ||
onLogin={this.props.assignAddress} | ||
onHide={this.handleHide} | ||
/> | ||
<ErrorMessage errors={errors} className={styles.error} /> | ||
</div> | ||
<div className={styles.actions}> | ||
<Button className={styles.button} onClick={this.handleSave}> | ||
Save | ||
</Button> | ||
<Button className={styles.button} theme="grey" onClick={onHide}> | ||
go back | ||
</Button> | ||
</div> | ||
<AssignAddressEffect | ||
onComplete={this.handleAssignComplete} | ||
onFailed={this.handleAssignFailed} | ||
)} | ||
</div> | ||
<DF.Description>Enter address manually</DF.Description> | ||
<DF.Field> | ||
<Input | ||
placeholder="Account Address" | ||
value={address} | ||
onChange={this.handleInputChange} | ||
/> | ||
</div> | ||
</div> | ||
<DF.FormError> | ||
<ErrorMessage errors={errors} /> | ||
</DF.FormError> | ||
</DF.Field> | ||
<DF.Actions> | ||
<Button className="gem-dialogform-button" onClick={this.handleSave}> | ||
Save | ||
</Button> | ||
<Button | ||
className="gem-dialogform-button" | ||
theme="grey" | ||
onClick={onHide} | ||
> | ||
go back | ||
</Button> | ||
</DF.Actions> | ||
<AssignAddressEffect | ||
onComplete={this.handleAssignComplete} | ||
onFailed={this.handleAssignFailed} | ||
/> | ||
</DF.Container> | ||
); | ||
@@ -136,0 +143,0 @@ } |
@@ -10,3 +10,8 @@ import React, { Component } from 'react'; | ||
import { Button, Input, ErrorMessage } from '@expandorg/components'; | ||
import { | ||
Button, | ||
Input, | ||
ErrorMessage, | ||
DialogForm as DF, | ||
} from '@expandorg/components'; | ||
@@ -21,4 +26,3 @@ import { confirmEmail, resendConfirmEmail } from '../../sagas'; | ||
import styles from '../serviceForms.module.styl'; | ||
import fstyles from './ConfirmEmailForm.module.styl'; | ||
import styles from './ConfirmEmailForm.module.styl'; | ||
@@ -103,9 +107,9 @@ const mapStateToProps = state => ({ | ||
return ( | ||
<div className={styles.container}> | ||
<form className={styles.inner} onSubmit={this.handleSubmit}> | ||
<div className={styles.title}>Please confirm email address</div> | ||
<div className={styles.description}> | ||
<DF.Container> | ||
<form onSubmit={this.handleSubmit}> | ||
<DF.Title>Please confirm email address</DF.Title> | ||
<DF.Description> | ||
Enter the confirmation code that was sent to your email | ||
</div> | ||
<div className={styles.field}> | ||
</DF.Description> | ||
<DF.Feild> | ||
<Input | ||
@@ -117,9 +121,9 @@ placeholder="Confirmation Code" | ||
/> | ||
<ErrorMessage errors={errors} className={fstyles.error} /> | ||
</div> | ||
<div className={fstyles.resend}> | ||
<ErrorMessage errors={errors} className={styles.error} /> | ||
</DF.Feild> | ||
<div className={styles.resend}> | ||
{!resent ? ( | ||
<span className={fstyles.text}> | ||
<span className={styles.text}> | ||
Didn't get the email? We can | ||
<button className={fstyles.btn} onClick={this.handleResend}> | ||
<button className={styles.btn} onClick={this.handleResend}> | ||
resend | ||
@@ -129,3 +133,3 @@ </button> | ||
) : ( | ||
<span className={fstyles.resent}> | ||
<span className={styles.resent}> | ||
Confirmation email has been resent | ||
@@ -135,5 +139,5 @@ </span> | ||
</div> | ||
<div className={styles.actions}> | ||
<DF.Actions> | ||
<Button | ||
className={styles.button} | ||
className="gem-dialogform-button" | ||
type="submit" | ||
@@ -145,3 +149,3 @@ disabled={confirming} | ||
<Button | ||
className={styles.button} | ||
className="gem-dialogform-button" | ||
theme="grey" | ||
@@ -153,7 +157,7 @@ onClick={onHide} | ||
</Button> | ||
</div> | ||
</DF.Actions> | ||
<ResendEffect onComplete={this.handleResendComplete} /> | ||
<ConfirmEmailEffect onFailed={this.handleConfirmFailed} /> | ||
</form> | ||
</div> | ||
</DF.Container> | ||
); | ||
@@ -160,0 +164,0 @@ } |
import React, { Component } from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import { Button } from '@expandorg/components'; | ||
import { Button, DialogForm as DF } from '@expandorg/components'; | ||
import styles from '../serviceForms.module.styl'; | ||
export default class EditEmailComplete extends Component { | ||
@@ -17,18 +15,16 @@ static propTypes = { | ||
return ( | ||
<div className={styles.container}> | ||
<form className={styles.inner}> | ||
<div className={styles.title}>Please confirm email address</div> | ||
<div className={styles.descriptionBold}> | ||
We’ve sent a confirmation email to your new email address. Please | ||
follow the link to confirm the change. | ||
</div> | ||
<div className={styles.actions}> | ||
<Button className={styles.button} onClick={onHide}> | ||
got it | ||
</Button> | ||
</div> | ||
</form> | ||
</div> | ||
<DF.Container> | ||
<DF.Title>Please confirm email address</DF.Title> | ||
<DF.Description bold> | ||
We’ve sent a confirmation email to your new email address. Please | ||
follow the link to confirm the change. | ||
</DF.Description> | ||
<DF.Actions> | ||
<Button className="gem-dialogform-button" onClick={onHide}> | ||
got it | ||
</Button> | ||
</DF.Actions> | ||
</DF.Container> | ||
); | ||
} | ||
} |
@@ -12,3 +12,8 @@ import React, { Component } from 'react'; | ||
import { Button, Input, ErrorMessage } from '@expandorg/components'; | ||
import { | ||
Button, | ||
Input, | ||
ErrorMessage, | ||
DialogForm as DF, | ||
} from '@expandorg/components'; | ||
@@ -19,4 +24,2 @@ import { editEmail } from '../../sagas'; | ||
import styles from '../serviceForms.module.styl'; | ||
const mapStateToProps = state => ({ | ||
@@ -74,7 +77,7 @@ editState: editEmailStateSelector(state), | ||
return ( | ||
<div className={styles.container}> | ||
<form className={styles.inner} onSubmit={this.handleSubmit}> | ||
<div className={styles.title}>Change Email Address</div> | ||
<div className={styles.descriptionBold}>{user.email}</div> | ||
<div className={styles.field}> | ||
<DF.Container> | ||
<form onSubmit={this.handleSubmit}> | ||
<DF.Title>Change Email Address</DF.Title> | ||
<DF.Description bold>{user.email}</DF.Description> | ||
<DF.Feild> | ||
<Input | ||
@@ -88,4 +91,4 @@ type="email" | ||
/> | ||
</div> | ||
<div className={styles.field}> | ||
</DF.Feild> | ||
<DF.Feild> | ||
<Input | ||
@@ -99,15 +102,21 @@ type="email" | ||
/> | ||
<ErrorMessage errors={errors} className={styles.error} /> | ||
</div> | ||
<div className={styles.actions}> | ||
<Button className={styles.button} type="submit"> | ||
<DF.FormError> | ||
<ErrorMessage errors={errors} /> | ||
</DF.FormError> | ||
</DF.Feild> | ||
<DF.Actions> | ||
<Button className="gem-dialogform-button" type="submit"> | ||
Save | ||
</Button> | ||
<Button className={styles.button} theme="grey" onClick={onHide}> | ||
<Button | ||
className="gem-dialogform-button" | ||
theme="grey" | ||
onClick={onHide} | ||
> | ||
go back | ||
</Button> | ||
</div> | ||
</DF.Actions> | ||
<EditEmailEffect onFailed={this.handleEditFailed} /> | ||
</form> | ||
</div> | ||
</DF.Container> | ||
); | ||
@@ -114,0 +123,0 @@ } |
@@ -15,3 +15,8 @@ import React, { Component } from 'react'; | ||
import { Button, Input, ErrorMessage } from '@expandorg/components'; | ||
import { | ||
Button, | ||
Input, | ||
ErrorMessage, | ||
DialogForm as DF, | ||
} from '@expandorg/components'; | ||
@@ -21,4 +26,2 @@ import { changePasswordStateSelector } from '../../selectors'; | ||
import styles from '../serviceForms.module.styl'; | ||
export const ChangePasswordEffect = submitStateEffect( | ||
@@ -83,6 +86,6 @@ changePasswordStateSelector | ||
return ( | ||
<div className={styles.container}> | ||
<form className={styles.inner} onSubmit={this.handleSubmit}> | ||
<div className={styles.title}>Change Password</div> | ||
<div className={styles.field}> | ||
<DF.Container> | ||
<form onSubmit={this.handleSubmit}> | ||
<DF.Title>Change Password</DF.Title> | ||
<DF.Field> | ||
<Input | ||
@@ -96,4 +99,4 @@ type="password" | ||
/> | ||
</div> | ||
<div className={styles.field}> | ||
</DF.Field> | ||
<DF.Field> | ||
<Input | ||
@@ -107,4 +110,4 @@ type="password" | ||
/> | ||
</div> | ||
<div className={styles.field}> | ||
</DF.Field> | ||
<DF.Field> | ||
<Input | ||
@@ -118,15 +121,21 @@ type="password" | ||
/> | ||
<ErrorMessage errors={errors} className={styles.error} /> | ||
</div> | ||
<div className={styles.actions}> | ||
<Button className={styles.button} type="submit"> | ||
<DF.FormError> | ||
<ErrorMessage errors={errors} /> | ||
</DF.FormError> | ||
</DF.Field> | ||
<DF.Actions> | ||
<Button className="gem-dialogform-button" type="submit"> | ||
Save | ||
</Button> | ||
<Button className={styles.button} theme="grey" onClick={onHide}> | ||
<Button | ||
className="gem-dialogform-button" | ||
theme="grey" | ||
onClick={onHide} | ||
> | ||
go back | ||
</Button> | ||
</div> | ||
</DF.Actions> | ||
<ChangePasswordEffect onFailed={this.handleEditFailed} /> | ||
</form> | ||
</div> | ||
</DF.Container> | ||
); | ||
@@ -133,0 +142,0 @@ } |
import React, { Component } from 'react'; | ||
import PropTypes from 'prop-types'; | ||
import { Button } from '@expandorg/components'; | ||
import { Button, DialogForm as DF } from '@expandorg/components'; | ||
import { ReactComponent as Checkmark } from '@expandorg/uikit/assets/checkmark-3.svg'; | ||
import styles from './serviceForms.module.styl'; | ||
export default class SuccessForm extends Component { | ||
@@ -25,25 +21,14 @@ static propTypes = { | ||
return ( | ||
<div className={styles.container}> | ||
<form className={styles.inner}> | ||
<div className={styles.icon}> | ||
<Checkmark | ||
className={styles.success} | ||
width={64} | ||
height={48} | ||
viewBox="0 0 64 48" | ||
/> | ||
</div> | ||
<div className={styles.title}>{title}</div> | ||
{children} | ||
<div className={styles.actions}> | ||
<Button className={styles.button} onClick={onHide}> | ||
{button} | ||
</Button> | ||
</div> | ||
</form> | ||
</div> | ||
<DF.Container> | ||
<DF.SuccessIcon /> | ||
<DF.Title>{title}</DF.Title> | ||
{children} | ||
<DF.Actions> | ||
<Button className="gem-dialogform-button" onClick={onHide}> | ||
{button} | ||
</Button> | ||
</DF.Actions> | ||
</DF.Container> | ||
); | ||
} | ||
} |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
996
32068
25