From 8198fa48d2e42d89457940590ec4b308ee541090 Mon Sep 17 00:00:00 2001 From: Sriram Viswanathan Date: Wed, 5 Apr 2017 11:17:29 -0300 Subject: [#938] Replaces submit button with a link button for redirection with @anikarni --- .../backup_account_step/backup_account_step.js | 5 +- .../backup_account_step.spec.js | 10 ++-- web-ui/src/common/link_button/link_button.js | 55 ++++++++++++++++++++++ web-ui/src/common/link_button/link_button.scss | 21 +++++++++ web-ui/src/common/link_button/link_button.spec.js | 20 ++++++++ 5 files changed, 101 insertions(+), 10 deletions(-) create mode 100644 web-ui/src/common/link_button/link_button.js create mode 100644 web-ui/src/common/link_button/link_button.scss create mode 100644 web-ui/src/common/link_button/link_button.spec.js (limited to 'web-ui') 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 }) => (
@@ -26,9 +26,8 @@ export const BackupAccountStep = ({ t }) => ( alt={t('account-recovery.backup-account-step.image-description')} />

{t('account-recovery.backup-account-step.title')}

-
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 . + */ + +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 }) => ( +
+ +
+); + +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 . + */ + +.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(); + }); + + 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'); + }); +}); -- cgit v1.2.3