diff options
5 files changed, 101 insertions, 10 deletions
diff --git a/web-ui/src/account_recovery/backup_account_step/backup_account_step.js b/web-ui/src/account_recovery/backup_account_step/backup_account_step.js index e0c31d88..891b45ec 100644 --- a/web-ui/src/account_recovery/backup_account_step/backup_account_step.js +++ b/web-ui/src/account_recovery/backup_account_step/backup_account_step.js @@ -16,7 +16,7 @@ */ import React from 'react'; import { translate } from 'react-i18next'; -import SubmitButton from 'src/common/submit_button/submit_button'; +import LinkButton from 'src/common/link_button/link_button'; export const BackupAccountStep = ({ t }) => ( <div className='account-recovery-form backup-account'> @@ -26,9 +26,8 @@ export const BackupAccountStep = ({ t }) => ( alt={t('account-recovery.backup-account-step.image-description')} /> <h1>{t('account-recovery.backup-account-step.title')}</h1> - <SubmitButton + <LinkButton buttonText={t('account-recovery.backup-account-step.buttonText')} - containerElement='a' href='/backup-account' /> </div> diff --git a/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js b/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js index 1d08670d..38a5e560 100644 --- a/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js +++ b/web-ui/src/account_recovery/backup_account_step/backup_account_step.spec.js @@ -1,7 +1,7 @@ import { shallow } from 'enzyme'; import expect from 'expect'; import React from 'react'; -import SubmitButton from 'src/common/submit_button/submit_button'; +import LinkButton from 'src/common/link_button/link_button'; import { BackupAccountStep } from './backup_account_step'; describe('BackupAccountStep', () => { @@ -17,15 +17,11 @@ describe('BackupAccountStep', () => { }); it('renders submit button with given href', () => { - expect(backupAccountStep.find(SubmitButton).props().href).toEqual('/backup-account'); - }); - - it('renders submit button with given container element', () => { - expect(backupAccountStep.find(SubmitButton).props().containerElement).toEqual('a'); + expect(backupAccountStep.find(LinkButton).props().href).toEqual('/backup-account'); }); it('renders submit button with given button text', () => { - expect(backupAccountStep.find(SubmitButton).props().buttonText) + expect(backupAccountStep.find(LinkButton).props().buttonText) .toEqual('account-recovery.backup-account-step.buttonText'); }); }); diff --git a/web-ui/src/common/link_button/link_button.js b/web-ui/src/common/link_button/link_button.js new file mode 100644 index 00000000..e18903f2 --- /dev/null +++ b/web-ui/src/common/link_button/link_button.js @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2017 ThoughtWorks, Inc. + * + * Pixelated is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pixelated is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Pixelated. If not, see <http://www.gnu.org/licenses/>. + */ + +import React from 'react'; +import RaisedButton from 'material-ui/RaisedButton'; + +import '../submit_button/submit_button.scss'; +import './link_button.scss'; + +const labelStyle = { + textTransform: 'none', + fontSize: '1em', + lineHeight: '48px', + color: '#ff9c00' +}; + +const buttonStyle = { + height: '48px', + backgroundColor: '#fff' +}; + +const LinkButton = ({ buttonText, href }) => ( + <div className='submit-button link-button'> + <RaisedButton + href={href} + containerElement='a' + label={buttonText} + labelStyle={labelStyle} + buttonStyle={buttonStyle} + overlayStyle={buttonStyle} + fullWidth + /> + </div> +); + +LinkButton.propTypes = { + buttonText: React.PropTypes.string.isRequired, + href: React.PropTypes.string.isRequired +}; + +export default LinkButton; diff --git a/web-ui/src/common/link_button/link_button.scss b/web-ui/src/common/link_button/link_button.scss new file mode 100644 index 00000000..9318e08e --- /dev/null +++ b/web-ui/src/common/link_button/link_button.scss @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2017 ThoughtWorks, Inc. + * + * Pixelated is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * Pixelated is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with Pixelated. If not, see <http://www.gnu.org/licenses/>. + */ + +.link-button > div { + margin-top: 2em; + border: 1px solid #ff9c00; +} diff --git a/web-ui/src/common/link_button/link_button.spec.js b/web-ui/src/common/link_button/link_button.spec.js new file mode 100644 index 00000000..dd040d28 --- /dev/null +++ b/web-ui/src/common/link_button/link_button.spec.js @@ -0,0 +1,20 @@ +import { shallow } from 'enzyme'; +import expect from 'expect'; +import React from 'react'; +import LinkButton from 'src/common/link_button/link_button'; + +describe('LinkButton', () => { + let linkButton; + + beforeEach(() => { + linkButton = shallow(<LinkButton buttonText='Go To Link' href='/some-link' />); + }); + + it('renders link button with given button text', () => { + expect(linkButton.find('RaisedButton').props().label).toEqual('Go To Link'); + }); + + it('renders link button with given href', () => { + expect(linkButton.find('RaisedButton').props().href).toEqual('/some-link'); + }); +}); |