diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-05-18 09:28:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-18 09:28:18 -0400 |
| commit | 2bbedd9def2a782f370fb5280994ea0ecbf8a7c7 (patch) | |
| tree | c97936580a81c561aa9884d1c414c54bd49d401a /webapp/components/get_android_app | |
| parent | 63e599c43b66f0dd95f7f07c783c40fdaf89e3fb (diff) | |
| download | chat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.tar.gz chat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.tar.bz2 chat-2bbedd9def2a782f370fb5280994ea0ecbf8a7c7.zip | |
Updating client dependencies. Switching to yarn. (#6433)
* Updating client dependancies. Switching to using yarn.
* Updating React
* Moving pure components to using function syntax (performance gains with newer react version)
* Updating client dependancies.
* Ignore .yarninstall
* Enabling pre-lockfile because it's the entire point of using yarn.
* Removing old webpack config
* Moving to new prop-types
* Fixing ESLint Errors
* Updating jest snapshots.
* Cleaning up package.json
Diffstat (limited to 'webapp/components/get_android_app')
| -rw-r--r-- | webapp/components/get_android_app/get_android_app.jsx | 118 |
1 files changed, 58 insertions, 60 deletions
diff --git a/webapp/components/get_android_app/get_android_app.jsx b/webapp/components/get_android_app/get_android_app.jsx index aa74d15ec..cf82b1179 100644 --- a/webapp/components/get_android_app/get_android_app.jsx +++ b/webapp/components/get_android_app/get_android_app.jsx @@ -9,67 +9,65 @@ import {Link} from 'react-router'; import MattermostIcon from 'images/favicon/android-chrome-192x192.png'; import Nexus6Mockup from 'images/nexus-6p-mockup.png'; -export default class GetAndroidApp extends React.Component { - render() { - return ( - <div className='get-app get-android-app'> - <h1 className='get-app__header'> - <FormattedMessage - id='get_app.androidHeader' - defaultMessage='Mattermost works best if you switch to our Android app' - /> - </h1> - <hr/> - <div> - <img - className='get-android-app__icon' - src={MattermostIcon} - /> - <div className='get-android-app__app-info'> - <span className='get-android-app__app-name'> - <FormattedMessage - id='get_app.androidAppName' - defaultMessage='Mattermost for Android' - /> - </span> - <span className='get-android-app__app-creator'> - <FormattedMessage - id='get_app.mattermostInc' - defaultMessage='Mattermost, Inc' - /> - </span> - </div> - </div> - <a - className='btn btn-primary get-android-app__continue' - href={global.window.mm_config.AndroidAppDownloadLink} - > - <FormattedMessage - id='get_app.continue' - defaultMessage='Continue' - /> - </a> +export default function GetAndroidApp() { + return ( + <div className='get-app get-android-app'> + <h1 className='get-app__header'> + <FormattedMessage + id='get_app.androidHeader' + defaultMessage='Mattermost works best if you switch to our Android app' + /> + </h1> + <hr/> + <div> <img - className='get-app__screenshot' - src={Nexus6Mockup} + className='get-android-app__icon' + src={MattermostIcon} /> - <span className='get-app__continue-with-browser'> - <FormattedMessage - id='get_app.continueWithBrowser' - defaultMessage='Or {link}' - values={{ - link: ( - <Link to='/switch_team'> - <FormattedMessage - id='get_app.continueWithBrowserLink' - defaultMessage='continue with browser' - /> - </Link> - ) - }} - /> - </span> + <div className='get-android-app__app-info'> + <span className='get-android-app__app-name'> + <FormattedMessage + id='get_app.androidAppName' + defaultMessage='Mattermost for Android' + /> + </span> + <span className='get-android-app__app-creator'> + <FormattedMessage + id='get_app.mattermostInc' + defaultMessage='Mattermost, Inc' + /> + </span> + </div> </div> - ); - } + <a + className='btn btn-primary get-android-app__continue' + href={global.window.mm_config.AndroidAppDownloadLink} + > + <FormattedMessage + id='get_app.continue' + defaultMessage='Continue' + /> + </a> + <img + className='get-app__screenshot' + src={Nexus6Mockup} + /> + <span className='get-app__continue-with-browser'> + <FormattedMessage + id='get_app.continueWithBrowser' + defaultMessage='Or {link}' + values={{ + link: ( + <Link to='/switch_team'> + <FormattedMessage + id='get_app.continueWithBrowserLink' + defaultMessage='continue with browser' + /> + </Link> + ) + }} + /> + </span> + </div> + ); } |