summaryrefslogtreecommitdiffhomepage
path: root/app/components/Settings.js
diff options
context:
space:
mode:
authorAndrej Mihajlov <and@mullvad.net>2018-06-01 16:13:10 +0200
committerAndrej Mihajlov <and@mullvad.net>2018-06-05 12:11:55 +0200
commitca2f6fbfcad7b73d4ea63ef46cb1cab943ec9087 (patch)
treeb1f7754eb50896ab3681e35fa4e08be642b940c9 /app/components/Settings.js
parent5852c980980de53e00d76a0bdb4b41bf5c0f5b39 (diff)
downloadmullvadvpn-ca2f6fbfcad7b73d4ea63ef46cb1cab943ec9087.tar.xz
mullvadvpn-ca2f6fbfcad7b73d4ea63ef46cb1cab943ec9087.zip
Add formatted source code
Diffstat (limited to 'app/components/Settings.js')
-rw-r--r--app/components/Settings.js168
1 files changed, 91 insertions, 77 deletions
diff --git a/app/components/Settings.js b/app/components/Settings.js
index 0f87da2c11..33fc371faa 100644
--- a/app/components/Settings.js
+++ b/app/components/Settings.js
@@ -2,7 +2,7 @@
import moment from 'moment';
import * as React from 'react';
import { Component, Text, View } from 'reactxp';
-import { Button, CellButton, RedButton, Label, SubText} from './styled';
+import { Button, CellButton, RedButton, Label, SubText } from './styled';
import { Layout, Container } from './Layout';
import CustomScrollbars from './CustomScrollbars';
import styles from './SettingsStyles';
@@ -30,8 +30,11 @@ export default class Settings extends Component<SettingsProps> {
<Layout>
<Container>
<View style={styles.settings}>
- <Button style={styles.settings__close} onPress={ this.props.onClose } testName='settings__close'>
- <Img height={24} width={24} style={styles.settings__close_icon} source='icon-close'/>
+ <Button
+ style={styles.settings__close}
+ onPress={this.props.onClose}
+ testName="settings__close">
+ <Img height={24} width={24} style={styles.settings__close_icon} source="icon-close" />
</Button>
<View style={styles.settings__container}>
@@ -39,17 +42,15 @@ export default class Settings extends Component<SettingsProps> {
<Text style={styles.settings__title}>Settings</Text>
</View>
- <CustomScrollbars style={styles.settings__scrollview} autoHide={ true }>
-
+ <CustomScrollbars style={styles.settings__scrollview} autoHide={true}>
<View style={styles.settings__content}>
<View>
- { this._renderTopButtons() }
- { this._renderMiddleButtons() }
- { this._renderBottomButtons() }
+ {this._renderTopButtons()}
+ {this._renderMiddleButtons()}
+ {this._renderBottomButtons()}
</View>
- { this._renderQuitButton() }
+ {this._renderQuitButton()}
</View>
-
</CustomScrollbars>
</View>
</View>
@@ -64,59 +65,69 @@ export default class Settings extends Component<SettingsProps> {
return null;
}
- let isOutOfTime = false, formattedExpiry = '';
+ let isOutOfTime = false,
+ formattedExpiry = '';
let expiryIso = this.props.account.expiry;
- if(isLoggedIn && expiryIso) {
+ if (isLoggedIn && expiryIso) {
let expiry = moment(this.props.account.expiry);
isOutOfTime = expiry.isSameOrBefore(moment());
formattedExpiry = (expiry.fromNow(true) + ' left').toUpperCase();
}
- return <View>
- <View style={styles.settings_account} testName='settings__account'>
- {isOutOfTime ? (
- <CellButton onPress={ this.props.onViewAccount }
- testName='settings__account_paid_until_button'>
- <Label>Account</Label>
- <SubText testName='settings__account_paid_until_subtext' style={styles.settings__account_paid_until_Label__error}>OUT OF TIME</SubText>
- <Img height={12} width={7} source='icon-chevron' />
- </CellButton>
- ) : (
- <CellButton onPress={ this.props.onViewAccount }
- testName='settings__account_paid_until_button'>
- <Label>Account</Label>
- <SubText testName='settings__account_paid_until_subtext'>{ formattedExpiry }</SubText>
- <Img height={12} width={7} source='icon-chevron' />
- </CellButton>
- )}
- </View>
+ return (
+ <View>
+ <View style={styles.settings_account} testName="settings__account">
+ {isOutOfTime ? (
+ <CellButton
+ onPress={this.props.onViewAccount}
+ testName="settings__account_paid_until_button">
+ <Label>Account</Label>
+ <SubText
+ testName="settings__account_paid_until_subtext"
+ style={styles.settings__account_paid_until_Label__error}>
+ OUT OF TIME
+ </SubText>
+ <Img height={12} width={7} source="icon-chevron" />
+ </CellButton>
+ ) : (
+ <CellButton
+ onPress={this.props.onViewAccount}
+ testName="settings__account_paid_until_button">
+ <Label>Account</Label>
+ <SubText testName="settings__account_paid_until_subtext">{formattedExpiry}</SubText>
+ <Img height={12} width={7} source="icon-chevron" />
+ </CellButton>
+ )}
+ </View>
- <CellButton onPress={ this.props.onViewPreferences }
- testName='settings__preferences'>
- <Label>Preferences</Label>
- <Img height={12} width={7} source='icon-chevron' />
- </CellButton>
+ <CellButton onPress={this.props.onViewPreferences} testName="settings__preferences">
+ <Label>Preferences</Label>
+ <Img height={12} width={7} source="icon-chevron" />
+ </CellButton>
- <CellButton onPress={ this.props.onViewAdvancedSettings }
- testName='settings__advanced'>
- <Label>Advanced</Label>
- <Img height={12} width={7} source='icon-chevron' />
- </CellButton>
- <View style={styles.settings__cell_spacer}/>
- </View>;
+ <CellButton onPress={this.props.onViewAdvancedSettings} testName="settings__advanced">
+ <Label>Advanced</Label>
+ <Img height={12} width={7} source="icon-chevron" />
+ </CellButton>
+ <View style={styles.settings__cell_spacer} />
+ </View>
+ );
}
_renderMiddleButtons() {
- return <View>
- <CellButton onPress={ this.props.onExternalLink.bind(this, 'download') }
- testName='settings__version'>
- <Label>App version</Label>
- <SubText>{this._formattedVersion()}</SubText>
- <Img height={16} width={16} source='icon-extLink' />
- </CellButton>
- <View style={styles.settings__cell_spacer}/>
- </View>;
+ return (
+ <View>
+ <CellButton
+ onPress={this.props.onExternalLink.bind(this, 'download')}
+ testName="settings__version">
+ <Label>App version</Label>
+ <SubText>{this._formattedVersion()}</SubText>
+ <Img height={16} width={16} source="icon-extLink" />
+ </CellButton>
+ <View style={styles.settings__cell_spacer} />
+ </View>
+ );
}
_formattedVersion() {
@@ -124,39 +135,42 @@ export default class Settings extends Component<SettingsProps> {
// version scheme. in package.json we thus have to write YEAR.release.X-channel and
// this function is responsible for removing .X part.
return this.props.version
- .replace('.0-', '-') // remove the .0 in 2018.1.0-beta9
+ .replace('.0-', '-') // remove the .0 in 2018.1.0-beta9
.replace(/\.0$/, ''); // remove the .0 in 2018.1.0
}
_renderBottomButtons() {
- return <View>
- <CellButton onPress={ this.props.onExternalLink.bind(this, 'faq') }
- testName='settings__external_link'>
- <Label>FAQs</Label>
- <Img height={16} width={16} source='icon-extLink' />
- </CellButton>
+ return (
+ <View>
+ <CellButton
+ onPress={this.props.onExternalLink.bind(this, 'faq')}
+ testName="settings__external_link">
+ <Label>FAQs</Label>
+ <Img height={16} width={16} source="icon-extLink" />
+ </CellButton>
- <CellButton onPress={ this.props.onExternalLink.bind(this, 'guides') }
- testName='settings__external_link'>
- <Label>Guides</Label>
- <Img height={16} width={16} source='icon-extLink' />
- </CellButton>
+ <CellButton
+ onPress={this.props.onExternalLink.bind(this, 'guides')}
+ testName="settings__external_link">
+ <Label>Guides</Label>
+ <Img height={16} width={16} source="icon-extLink" />
+ </CellButton>
- <CellButton onPress={ this.props.onViewSupport }
- testName='settings__view_support'>
- <Label>Report a problem</Label>
- <Img height={12} width={7} source='icon-chevron' />
- </CellButton>
- </View>;
+ <CellButton onPress={this.props.onViewSupport} testName="settings__view_support">
+ <Label>Report a problem</Label>
+ <Img height={12} width={7} source="icon-chevron" />
+ </CellButton>
+ </View>
+ );
}
_renderQuitButton() {
- return <View style={styles.settings__footer}>
- <RedButton
- onPress={this.props.onQuit}
- testName='settings__quit'>
- <Label>Quit app</Label>
- </RedButton>
- </View>;
+ return (
+ <View style={styles.settings__footer}>
+ <RedButton onPress={this.props.onQuit} testName="settings__quit">
+ <Label>Quit app</Label>
+ </RedButton>
+ </View>
+ );
}
-} \ No newline at end of file
+}