TryGhost/Ghost
1
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2024-11-29 15:12:58 +03:00
Code Issues Projects Releases Wiki Activity

Updated pages to use common components

Browse Source 
no issue

- Updates Signin page to use common ActionButton and Input component
- Updates Signup page to use common ActionButton and Input component
- Updates MagicLink page to use common ActionButton component
This commit is contained in:
Rish 2020-04-27 13:51:25 +05:30
parent 100bfa7b5b
commit c53654d89b
3 changed files with 42 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ghost/portal/src/components/pages/MagicLinkPage.js
View File

@ -1,3 +1,4 @@
import ActionButton from '../common/ActionButton';
const React = require('react');
export default class MagicLinkPage extends React.Component {
@ -23,33 +24,13 @@ export default class MagicLinkPage extends React.Component {
}
renderCloseButton() {
const buttonStyle = {
display: 'inline-block',
padding: '0 1.8rem',
height: '44px',
border: '0',
fontSize: '1.5rem',
lineHeight: '42px',
fontWeight: '600',
textAlign: 'center',
textDecoration: 'none',
whiteSpace: 'nowrap',
borderRadius: '5px',
cursor: 'pointer',
transition: '.4s ease',
color: '#fff',
backgroundColor: this.props.brandColor || '#3eb0ef',
boxShadow: 'none',
userSelect: 'none',
width: '100%',
marginBottom: '12px'
};
const label = 'Close';
return (
<button onClick={(e) => {
this.handleClose(e);
}} style={buttonStyle}>
Close
</button>
<ActionButton
onClick={e => this.handleSignin(e)}
brandColor={this.props.brandColor}
label={label}
/>
);
}

67
ghost/portal/src/components/pages/SigninPage.js
View File

@ -1,3 +1,6 @@
import ActionButton from '../common/ActionButton';
import InputField from '../common/InputField';
const React = require('react');
const PropTypes = require('prop-types');
@ -35,60 +38,20 @@ export default class SigninPage extends React.Component {
}
renderSubmitButton() {
const buttonStyle = {
display: 'inline-block',
padding: '0 1.8rem',
height: '44px',
border: '0',
fontSize: '1.5rem',
lineHeight: '42px',
fontWeight: '600',
textAlign: 'center',
textDecoration: 'none',
whiteSpace: 'nowrap',
borderRadius: '5px',
cursor: 'pointer',
transition: '.4s ease',
color: '#fff',
backgroundColor: this.props.brandColor || '#3eb0ef',
boxShadow: 'none',
userSelect: 'none',
width: '100%',
marginBottom: '12px'
};
const isRunning = this.props.action && this.props.action.name === 'signin' && this.props.action.isRunning;
const label = this.state.isLoading ? 'Sending' : 'Send Login Link';
const disabled = isRunning ? true : false;
if (disabled) {
buttonStyle.backgroundColor = 'grey';
}
return (
<button onClick={(e) => {
this.handleSignin(e);
}} style={buttonStyle} disabled={disabled}>
{label}
</button>
<ActionButton
onClick={e => this.handleSignin(e)}
disabled={disabled}
brandColor={this.props.brandColor}
label={label}
/>
);
}
renderInputField(fieldName) {
const inputStyle = {
display: 'block',
padding: '0 .6em',
width: '100%',
height: '44px',
outline: '0',
border: '1px solid #c5d2d9',
color: 'inherit',
textDecoration: 'none',
background: '#fff',
borderRadius: '9px',
fontSize: '14px',
marginBottom: '12px',
boxSizing: 'border-box'
};
const fields = {
email: {
type: 'email',
@ -100,20 +63,14 @@ export default class SigninPage extends React.Component {
};
const field = fields[fieldName];
return (
<>
<label htmlFor={field.name} style={{marginBottom: '3px', fontSize: '12px', fontWeight: '700'}}> {field.label} </label>
<input
<InputField
label = {field.label}
type={field.type}
name={field.name}
placeholder={field.placeholder}
value={field.value}
onChange={(e) => {
this.handleInput(e, fieldName);
}}
style={inputStyle}
aria-label={field.label}
onChange={(e, fieldName) => this.handleInput(e, fieldName)}
/>
</>
);
}

68
ghost/portal/src/components/pages/SignupPage.js
View File

@ -1,3 +1,6 @@
import ActionButton from '../common/ActionButton';
import InputField from '../common/InputField';
const React = require('react');
const PropTypes = require('prop-types');
@ -41,39 +44,16 @@ export default class SignupPage extends React.Component {
}
renderSubmitButton() {
const buttonStyle = {
display: 'inline-block',
padding: '0 1.8rem',
height: '44px',
border: '0',
fontSize: '1.5rem',
lineHeight: '42px',
fontWeight: '600',
textAlign: 'center',
textDecoration: 'none',
whiteSpace: 'nowrap',
borderRadius: '5px',
cursor: 'pointer',
transition: '.4s ease',
color: '#fff',
backgroundColor: this.props.brandColor || '#3eb0ef',
boxShadow: 'none',
userSelect: 'none',
width: '100%',
marginBottom: '12px'
};
const isRunning = this.props.action && this.props.action.name === 'signup' && this.props.action.isRunning;
const label = this.state.isLoading ? 'Sending' : 'Continue';
const label = this.state.isLoading ? 'Sending...' : 'Continue';
const disabled = isRunning ? true : false;
if (disabled) {
buttonStyle.backgroundColor = 'grey';
}
return (
<button onClick={(e) => {
this.handleSignup(e);
}} style={buttonStyle} disabled={disabled}>
{label}
</button>
<ActionButton
onClick={e => this.handleSignup(e)}
disabled={disabled}
brandColor={this.props.brandColor}
label={label}
/>
);
}
@ -200,22 +180,6 @@ export default class SignupPage extends React.Component {
}
renderInputField(fieldName) {
const inputStyle = {
display: 'block',
padding: '0 .6em',
width: '100%',
height: '44px',
outline: '0',
border: '1px solid #c5d2d9',
color: 'inherit',
textDecoration: 'none',
background: '#fff',
borderRadius: '9px',
fontSize: '14px',
marginBottom: '12px',
boxSizing: 'border-box'
};
const fields = {
name: {
type: 'text',
@ -234,20 +198,14 @@ export default class SignupPage extends React.Component {
};
const field = fields[fieldName];
return (
<>
<label htmlFor={field.name} style={{marginBottom: '3px', fontSize: '12px', fontWeight: '700'}}> {field.label} </label>
<input
<InputField
label = {field.label}
type={field.type}
name={field.name}
placeholder={field.placeholder}
value={field.value}
onChange={(e) => {
this.handleInput(e, fieldName);
}}
style={inputStyle}
aria-label={field.label}
onChange={(e, fieldName) => this.handleInput(e, fieldName)}
/>
</>
);
}