Skip to content

Commit

Permalink
eslint automatic fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
dzikowski committed May 17, 2017
1 parent b1963ac commit f9cd696
Show file tree
Hide file tree
Showing 18 changed files with 197 additions and 210 deletions.
24 changes: 12 additions & 12 deletions app/App.js
@@ -1,29 +1,29 @@
import React, {Component} from "react";
import {BrowserRouter as Router} from "react-router-dom";
import Routes from "./Routes";
import Header from "./header/Header";
import {Layout} from "react-toolbox/lib/layout";
import User from "./profile/User";
import Auth from "./profile/Auth";
import React, { Component } from 'react';
import { BrowserRouter as Router } from 'react-router-dom';
import Routes from './Routes';
import Header from './header/Header';
import { Layout } from 'react-toolbox/lib/layout';
import User from './profile/User';
import Auth from './profile/Auth';

class App extends Component {

auth = new Auth({
updateUser: user => this.setState({...this.state, user})
updateUser: user => this.setState({ ...this.state, user }),
});

state = {
user: User.signedOut(null)
user: User.signedOut(null),
};

render() {
return (
<Layout>
<Router>
<div>
<Header auth={this.auth} user={this.state.user}/>
<div style={{margin: '0 3em'}}>
<Routes auth={this.auth} user={this.state.user}/>
<Header auth={this.auth} user={this.state.user} />
<div style={{ margin: '0 3em' }}>
<Routes auth={this.auth} user={this.state.user} />
</div>
</div>
</Router>
Expand Down
16 changes: 8 additions & 8 deletions app/Routes.js
@@ -1,13 +1,13 @@
import React from "react";
import {Home} from "./home/Home";
import ProfileRoutes from "./profile/ProfileRoutes";
import {DefaultRoute} from "./common/routes";
import React from 'react';
import { Home } from './home/Home';
import ProfileRoutes from './profile/ProfileRoutes';
import { DefaultRoute } from './common/routes';

const Routes = ({user, auth, ...rest}) => (
const Routes = ({ user, auth, ...rest }) => (
<div>
<DefaultRoute exact path="/" component={Home}/>
<ProfileRoutes user={user} auth={auth}/>
<DefaultRoute exact path="/" component={Home} />
<ProfileRoutes user={user} auth={auth} />
</div>
);

export default Routes;
export default Routes;
22 changes: 11 additions & 11 deletions app/common/messages.js
@@ -1,37 +1,37 @@
import React from "react";
import {FontIcon} from "react-toolbox/lib/font_icon";
import {ProgressBar} from "react-toolbox/lib/progress_bar";
import React from 'react';
import { FontIcon } from 'react-toolbox/lib/font_icon';
import { ProgressBar } from 'react-toolbox/lib/progress_bar';

const styles = {
error: {
color: 'indianred',
margin: '1em 0'
margin: '1em 0',
},
loading: {
color: 'gray'
color: 'gray',
},
loadingIcon: {
width: '2em',
height: '2em'
height: '2em',
},
messageIcon: {
float: 'left',
marginTop: '-0.2em',
fontSize: '2em'
fontSize: '2em',
},
messageText: {
marginLeft: '2.5em'
}
marginLeft: '2.5em',
},
};

export const ErrorMessage = ({text, ...rest}) => (
export const ErrorMessage = ({ text, ...rest }) => (
<div style={styles.error}>
<FontIcon style={styles.messageIcon}>error_outline</FontIcon>
<div style={styles.messageText}>{text}</div>
</div>
);

export const Loader = ({text, ...rest}) => (
export const Loader = ({ text, ...rest }) => (
<div style={styles.loading}>
<ProgressBar type="linear" mode="indeterminate" />
<div>{text}</div>
Expand Down
24 changes: 12 additions & 12 deletions app/common/routes.js
@@ -1,29 +1,29 @@
import React from "react";
import {Route, Redirect} from "react-router-dom";
import React from 'react';
import { Route, Redirect } from 'react-router-dom';

const mergedProps = (...props) => Object.assign({}, ...props);

export const DefaultRoute = ({component: Component, ...rest}) => (
export const DefaultRoute = ({ component: Component, ...rest }) => (
<Route
{...rest}
render={(props) => <Component {...mergedProps(rest, props)} />}
render={props => <Component {...mergedProps(rest, props)} />}
/>
);

export const PublicRoute = ({component: Component, user, ...rest}) => (
export const PublicRoute = ({ component: Component, user, ...rest }) => (
<Route
{...rest}
render={(props) => user.signedIn === false
? <Component {...mergedProps({user}, rest, props)} />
: <Redirect to={{pathname: '/', state: {from: props.location}}}/>}
render={props => user.signedIn === false
? <Component {...mergedProps({ user }, rest, props)} />
: <Redirect to={{ pathname: '/', state: { from: props.location } }} />}
/>
);

export const PrivateRoute = ({component: Component, user, ...rest}) => (
export const PrivateRoute = ({ component: Component, user, ...rest }) => (
<Route
{...rest}
render={(props) => user.signedIn === true
? <Component {...mergedProps({user}, rest, props)} />
: <Redirect to={{pathname: '/', state: {from: props.location}}}/>}
render={props => user.signedIn === true
? <Component {...mergedProps({ user }, rest, props)} />
: <Redirect to={{ pathname: '/', state: { from: props.location } }} />}
/>
);
4 changes: 2 additions & 2 deletions app/config.js
@@ -1,4 +1,4 @@
export const cognitoConfig = {
poolId: COGNITO_POOL_ID,
appClientId: COGNITO_APP_CLIENT_ID
};
appClientId: COGNITO_APP_CLIENT_ID,
};
20 changes: 10 additions & 10 deletions app/header/Header.js
@@ -1,30 +1,30 @@
import React from "react";
import {Link} from "react-router-dom";
import {Navigation} from "react-toolbox/lib/navigation";
import {AppBar} from "react-toolbox/lib/app_bar";
import ProfileMenu from "./ProfileMenu";
import React from 'react';
import { Link } from 'react-router-dom';
import { Navigation } from 'react-toolbox/lib/navigation';
import { AppBar } from 'react-toolbox/lib/app_bar';
import ProfileMenu from './ProfileMenu';

const styles = {
title: {
cursor: 'pointer',
textDecoration: 'none',
color: 'inherit',
textTransform: 'uppercase',
marginLeft: '24px'
}
marginLeft: '24px',
},
};

const SignInButtons = ({auth}) => (
const SignInButtons = ({ auth }) => (
<div>
<Link style={styles.title} to="/profile/register">Register</Link>
<Link style={styles.title} to="/profile/sign-in">Sign In</Link>
</div>
);

const Header = ({auth, user}) => (
const Header = ({ auth, user }) => (
<AppBar title="Serverless WebApp Starter" leftIcon="menu">
<Navigation type="horizontal">
{user.signedIn ? <ProfileMenu auth={auth} user={user}/> : <SignInButtons auth={auth}/>}
{user.signedIn ? <ProfileMenu auth={auth} user={user} /> : <SignInButtons auth={auth} />}
</Navigation>
</AppBar>
);
Expand Down
16 changes: 8 additions & 8 deletions app/header/ProfileMenu.js
@@ -1,27 +1,27 @@
import React, {Component} from "react";
import {IconMenu, MenuItem} from "react-toolbox/lib/menu";
import CognitoService from "../profile/CognitoService";
import React, { Component } from 'react';
import { IconMenu, MenuItem } from 'react-toolbox/lib/menu';
import CognitoService from '../profile/CognitoService';

class ProfileMenu extends Component {

static contextTypes = {
router: React.PropTypes.object
router: React.PropTypes.object,
};

openProfile = () => {
this.context.router.history.push('/profile/home');
};

signOut = () => {
const {auth, user} = this.props;
auth.signOut({email: user.email});
const { auth, user } = this.props;
auth.signOut({ email: user.email });
};

render() {
return (
<IconMenu icon="more_vert" position="topRight" menuRipple>
<MenuItem value="profile" caption="Profile" onClick={this.openProfile}/>
<MenuItem value="signOut" caption="Sign out" onClick={this.signOut}/>
<MenuItem value="profile" caption="Profile" onClick={this.openProfile} />
<MenuItem value="signOut" caption="Sign out" onClick={this.signOut} />
</IconMenu>
);
}
Expand Down
2 changes: 1 addition & 1 deletion app/home/Home.js
@@ -1,4 +1,4 @@
import React from "react";
import React from 'react';

export const Home = () => (
<div>
Expand Down
10 changes: 5 additions & 5 deletions app/index.js
@@ -1,6 +1,6 @@
import React from "react";
import ReactDOM from "react-dom";
import "./styles/app.css"
import App from "./App"
import React from 'react';
import ReactDOM from 'react-dom';
import './styles/app.css';
import App from './App';

ReactDOM.render(<App/>, document.getElementById('app'));
ReactDOM.render(<App />, document.getElementById('app'));
33 changes: 14 additions & 19 deletions app/profile/Auth.js
@@ -1,10 +1,9 @@
import User from "./User";
import CognitoService from "./CognitoService";
import User from './User';
import CognitoService from './CognitoService';

class Auth {

constructor({updateUser}) {

constructor({ updateUser }) {
this.updateUser = (user) => {
console.log('Update user', user);
updateUser(user);
Expand All @@ -13,49 +12,45 @@ class Auth {
this.cognitoService = new CognitoService();
}

register({email, password, onSuccess, onFailure}) {

register({ email, password, onSuccess, onFailure }) {
const registerSuccess = () => {
this.updateUser(User.signedOut(email));
onSuccess();
};

this.cognitoService.register({email, password, ...{onSuccess: registerSuccess}, onFailure});
this.cognitoService.register({ email, password, ...{ onSuccess: registerSuccess }, onFailure });
}

confirmRegistration({email, code, onSuccess, onFailure}) {

confirmRegistration({ email, code, onSuccess, onFailure }) {
const confirmSuccess = () => {
this.updateUser(User.signedOut(email));
onSuccess();
};

this.cognitoService.confirmRegistration({email, code, ...{onSuccess: confirmSuccess}, onFailure});
this.cognitoService.confirmRegistration({ email, code, ...{ onSuccess: confirmSuccess }, onFailure });
}

requestCodeAgain({email, onSuccess, onFailure}) {

requestCodeAgain({ email, onSuccess, onFailure }) {
const requestSuccess = () => {
this.updateUser(User.signedOut(email));
onSuccess();
};

this.cognitoService.requestCodeAgain({email, ...{onSuccess: requestSuccess}, onFailure})
this.cognitoService.requestCodeAgain({ email, ...{ onSuccess: requestSuccess }, onFailure });
}

signIn({email, password, onSuccess, onFailure}) {

signIn({ email, password, onSuccess, onFailure }) {
const signInSuccess = () => {
this.updateUser(User.signedIn(email), onSuccess);
onSuccess();
};

this.cognitoService.signIn({email, password, ...{onSuccess: signInSuccess}, onFailure});
this.cognitoService.signIn({ email, password, ...{ onSuccess: signInSuccess }, onFailure });
}

signOut({email}) {
this.cognitoService.signOut({email: email, onSuccess: () => this.updateUser(User.signedOut(email))});
signOut({ email }) {
this.cognitoService.signOut({ email, onSuccess: () => this.updateUser(User.signedOut(email)) });
}
}

export default Auth;
export default Auth;

0 comments on commit f9cd696

Please sign in to comment.