Improve log in look and feel.

master
Tom Hacohen 7 years ago
parent 622805a5b6
commit 516bdd2622

@ -33,7 +33,7 @@ const muiTheme = getMuiTheme({
} }
}); });
function getPalette(part: string): string { export function getPalette(part: string): string {
const theme = muiTheme; const theme = muiTheme;
if ((theme.palette === undefined) || (theme.palette[part] === undefined)) { if ((theme.palette === undefined) || (theme.palette[part] === undefined)) {
return ''; return '';

@ -4,4 +4,6 @@ export const faq = homePage + 'faq/';
export const sourceCode = 'https://github.com/etesync/etesync-web'; export const sourceCode = 'https://github.com/etesync/etesync-web';
export const reportIssue = sourceCode + '/issues'; export const reportIssue = sourceCode + '/issues';
export const forgotPassword = 'https://www.etesync.com/accounts/password/reset/';
export const serviceApiBase = 'https://api.etesync.com/'; export const serviceApiBase = 'https://api.etesync.com/';

@ -1,5 +1,6 @@
import * as React from 'react'; import * as React from 'react';
import { Switch, Route, Redirect } from 'react-router'; import { Switch, Route, Redirect } from 'react-router';
import Paper from 'material-ui/Paper';
import RaisedButton from 'material-ui/RaisedButton'; import RaisedButton from 'material-ui/RaisedButton';
import TextField from 'material-ui/TextField'; import TextField from 'material-ui/TextField';
import Toggle from 'material-ui/Toggle'; import Toggle from 'material-ui/Toggle';
@ -9,7 +10,7 @@ import { JournalView } from './JournalView';
import * as EteSync from './api/EteSync'; import * as EteSync from './api/EteSync';
import { routeResolver } from './App'; import { routeResolver, getPalette } from './App';
import * as C from './Constants'; import * as C from './Constants';
@ -118,36 +119,66 @@ export class EteSyncContext extends React.Component {
); );
} }
const styles = {
holder: {
margin: 'auto',
maxWidth: 400,
padding: 20,
},
paper: {
padding: 20,
},
form: {
},
forgotPassword: {
color: getPalette('accent1Color'),
paddingTop: 20,
},
advancedSettings: {
marginTop: 20,
},
submit: {
marginTop: 40,
textAlign: 'right',
},
};
return ( return (
<div> <div style={styles.holder}>
{(this.state.error !== undefined) && (<div>Error! {this.state.error.message}</div>)} <Paper zDepth={2} style={styles.paper}>
<form onSubmit={this.generateEncryption}> {(this.state.error !== undefined) && (<div>Error! {this.state.error.message}</div>)}
<TextField <h2>Please Log In</h2>
type="text" <form style={styles.form} onSubmit={this.generateEncryption}>
floatingLabelText="Username" <TextField
ref={(input) => this.username = input as TextField} type="text"
/> floatingLabelText="Email"
<br /> ref={(input) => this.username = input as TextField}
<TextField />
type="password" <TextField
floatingLabelText="Password" type="password"
ref={(input) => this.password = input as TextField} floatingLabelText="Password"
/> ref={(input) => this.password = input as TextField}
<br /> />
<TextField <div style={styles.forgotPassword}>
type="password" <a href={C.forgotPassword}>Forgot password?</a>
floatingLabelText="Encryption Password" </div>
ref={(input) => this.encryptionPassword = input as TextField} <TextField
/> type="password"
<br /> floatingLabelText="Encryption Password"
<Toggle ref={(input) => this.encryptionPassword = input as TextField}
label="Advanced settings" />
toggled={this.state.showAdvanced} <Toggle
onToggle={this.toggleAdvancedSettings} label="Advanced settings"
/> style={styles.advancedSettings}
{advancedSettings} toggled={this.state.showAdvanced}
<RaisedButton type="submit" label="Log In" secondary={true} /> onToggle={this.toggleAdvancedSettings}
</form> />
{advancedSettings}
<div style={styles.submit}>
<RaisedButton type="submit" label="Log In" secondary={true} />
</div>
</form>
</Paper>
</div> </div>
); );
} else if ((this.state.context === undefined) || } else if ((this.state.context === undefined) ||

Loading…
Cancel
Save