This repository has been archived by the owner on Jan 2, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 71
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1011 from pixelated/confirmation-page
[#971] Add backup account confirmation page
- Loading branch information
Showing
12 changed files
with
312 additions
and
60 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,75 @@ | ||
/* | ||
* 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 "~scss/vendor/reset"; | ||
@import "~scss/base/colors"; | ||
@import "~scss/base/fonts"; | ||
|
||
|
||
form { | ||
width: 100%; | ||
} | ||
|
||
.backup-email-container { | ||
width: 84%; | ||
padding: 6% 5%; | ||
display: flex; | ||
align-items: flex-start; | ||
flex-direction: column; | ||
} | ||
|
||
.backup-account-image { | ||
width: 50%; | ||
height: 100%; | ||
align-self: center; | ||
} | ||
|
||
@media only screen and (min-width : 500px) { | ||
form { | ||
display: flex; | ||
flex-direction: column; | ||
|
||
.input-field-group, .submit-button, .link-content { | ||
width: 70%; | ||
align-self: center; | ||
} | ||
} | ||
} | ||
|
||
@media only screen and (min-width : 960px) { | ||
.backup-email-container{ | ||
width: 60%; | ||
max-width: 700px; | ||
padding: 3em; | ||
align-items: flex-start; | ||
flex-direction: row; | ||
|
||
form { | ||
margin-left: 2.5em; | ||
min-height: 492px; | ||
|
||
.input-field-group, .submit-button, .link-content { | ||
width: 300px; | ||
align-self: flex-start; | ||
} | ||
} | ||
} | ||
|
||
.backup-account-image { | ||
width: 300px; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,45 @@ | ||
/* | ||
* 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 { translate } from 'react-i18next'; | ||
import SubmitButton from 'src/common/submit_button/submit_button'; | ||
|
||
import './confirmation.scss'; | ||
|
||
export const Confirmation = ({ t }) => ( | ||
<div className='container confirmation-container'> | ||
<h1>{t('backup-account.confirmation.title1')} <br /> {t('backup-account.confirmation.title2')}</h1> | ||
<p>{t('backup-account.confirmation.paragraph')}</p> | ||
<img src='/public/images/sent-mail.svg' alt='Sent mail' /> | ||
<form action='/'> | ||
<SubmitButton buttonText={t('backup-account.confirmation.button')} type='submit' /> | ||
</form> | ||
<div className='link-content'> | ||
<a href='/backup-account' className='link'> | ||
<i className='fa fa-angle-left' aria-hidden='true' /> | ||
<span>{t('backup-account.confirmation.retry-button')}</span> | ||
</a> | ||
</div> | ||
</div> | ||
); | ||
|
||
Confirmation.propTypes = { | ||
t: React.PropTypes.func.isRequired | ||
}; | ||
|
||
export default translate('', { wait: true })(Confirmation); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
/* | ||
* 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 "~scss/vendor/reset"; | ||
@import "~scss/base/colors"; | ||
@import "~scss/base/fonts"; | ||
|
||
.confirmation-container { | ||
width: 84%; | ||
padding: 6% 5%; | ||
display: flex; | ||
align-items: center; | ||
flex-direction: column; | ||
|
||
img { | ||
padding: 2em 3.2em 2em 0; | ||
} | ||
} | ||
|
||
.submit-button { | ||
align-self: center; | ||
} | ||
|
||
@media only screen and (min-width : 500px) { | ||
.confirmation-container { | ||
width: 50%; | ||
padding: 1em 2em; | ||
} | ||
|
||
.submit-button { | ||
width: 70%; | ||
} | ||
} | ||
|
||
@media only screen and (min-width : 960px) { | ||
.confirmation-container { | ||
width: 30%; | ||
padding: 1em 2em; | ||
display: flex; | ||
flex-direction: column; | ||
} | ||
|
||
.submit-button { | ||
width: 65%; | ||
} | ||
} |
29 changes: 29 additions & 0 deletions
29
web-ui/src/backup_account/confirmation/confirmation.spec.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
import { shallow } from 'enzyme'; | ||
import expect from 'expect'; | ||
import React from 'react'; | ||
import { Confirmation } from 'src/backup_account/confirmation/confirmation'; | ||
|
||
describe('Confirmation', () => { | ||
let page; | ||
|
||
beforeEach(() => { | ||
const mockTranslations = key => key; | ||
page = shallow(<Confirmation t={mockTranslations} />); | ||
}); | ||
|
||
it('renders confirmation title', () => { | ||
expect(page.find('h1').text()).toContain('backup-account.confirmation.title1'); | ||
}); | ||
|
||
it('renders confirmation submit button', () => { | ||
expect(page.find('SubmitButton').props().buttonText).toEqual('backup-account.confirmation.button'); | ||
}); | ||
|
||
it('renders confirmation retry button', () => { | ||
expect(page.find('a').text()).toEqual('backup-account.confirmation.retry-button'); | ||
}); | ||
|
||
it('retries button redirects to backup account', () => { | ||
expect(page.find('a').props().href).toEqual('/backup-account'); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.