diff options
author | Anike Arni <anikarni@gmail.com> | 2017-02-23 17:52:14 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-02-23 17:52:14 -0300 |
commit | d77d9c41e5a5b791cf54082f0f1ae83699f0bc95 (patch) | |
tree | 01c1431956f26dee28287281feeb926cab9c4835 /web-ui/src/backup_account | |
parent | b06face47a2e19cc1afcda3f0e298d19f7dcb6bb (diff) | |
parent | 5fbfde0e465539c5e8a03764a695cc45a85b1ca2 (diff) |
Merge pull request #990 from pixelated/login-errors
Create full translation integration test
Diffstat (limited to 'web-ui/src/backup_account')
-rw-r--r-- | web-ui/src/backup_account/app.js | 38 | ||||
-rw-r--r-- | web-ui/src/backup_account/backup_account.js | 5 |
2 files changed, 3 insertions, 40 deletions
diff --git a/web-ui/src/backup_account/app.js b/web-ui/src/backup_account/app.js deleted file mode 100644 index 49fe0712..00000000 --- a/web-ui/src/backup_account/app.js +++ /dev/null @@ -1,38 +0,0 @@ -/* - * 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 { I18nextProvider } from 'react-i18next'; - -import PageWrapper from './page'; -import internationalization from '../i18n'; - -const App = ({ i18n = internationalization }) => ( - <I18nextProvider i18n={i18n}> - <PageWrapper /> - </I18nextProvider> -); - -App.propTypes = { - i18n: React.PropTypes.object // eslint-disable-line react/forbid-prop-types -}; - -App.defaultProps = { - i18n: internationalization -}; - -export default App; diff --git a/web-ui/src/backup_account/backup_account.js b/web-ui/src/backup_account/backup_account.js index fb431cff..ac218a39 100644 --- a/web-ui/src/backup_account/backup_account.js +++ b/web-ui/src/backup_account/backup_account.js @@ -19,11 +19,12 @@ import React from 'react'; import { render } from 'react-dom'; import a11y from 'react-a11y'; -import App from './app'; +import App from 'src/common/app'; +import PageWrapper from './page'; if (process.env.NODE_ENV === 'development') a11y(React); render( - <App />, + <App child={<PageWrapper />} />, document.getElementById('root') ); |