diff --git a/client/modules/User/pages/LoginView.js b/client/modules/User/pages/LoginView.js index 76c2e4cb..b60d9181 100644 --- a/client/modules/User/pages/LoginView.js +++ b/client/modules/User/pages/LoginView.js @@ -4,15 +4,13 @@ import { reduxForm } from 'redux-form'; import * as UserActions from '../actions'; import LoginForm from '../components/LoginForm'; -class LoginView extends React.Component { - render() { - return ( -
-

Login

- -
- ); - } +function LoginView(props) { + return ( +
+

Login

+ +
+ ); } function mapStateToProps(state) { diff --git a/client/modules/User/pages/SignupView.js b/client/modules/User/pages/SignupView.js index e94c4ba3..a7ec9ef3 100644 --- a/client/modules/User/pages/SignupView.js +++ b/client/modules/User/pages/SignupView.js @@ -4,15 +4,13 @@ import * as UserActions from '../actions'; import { reduxForm } from 'redux-form'; import SignupForm from '../components/SignupForm'; -class SignupView extends React.Component { - render() { - return ( -
-

Sign Up

- -
- ); - } +function SignupView(props) { + return ( +
+

Sign Up

+ +
+ ); } function mapStateToProps(state) { diff --git a/server/config/passport.js b/server/config/passport.js index d855dad4..0b78b96c 100644 --- a/server/config/passport.js +++ b/server/config/passport.js @@ -86,4 +86,4 @@ passport.use(new LocalStrategy({ usernameField: 'email' }, (email, password, don // }); // }); // } -// })); \ No newline at end of file +// })); diff --git a/server/models/user.js b/server/models/user.js index 6294a9fb..5e20392c 100644 --- a/server/models/user.js +++ b/server/models/user.js @@ -32,9 +32,10 @@ userSchema.pre('save', function (next) { * Helper method for validating user's password. */ userSchema.methods.comparePassword = function (candidatePassword, cb) { +// userSchema.methods.comparePassword = (candidatePassword, cb) => { bcrypt.compare(candidatePassword, this.password, (err, isMatch) => { cb(err, isMatch); }); }; -export default mongoose.model('User', userSchema); \ No newline at end of file +export default mongoose.model('User', userSchema); diff --git a/server/server.js b/server/server.js index e241e32b..09673442 100644 --- a/server/server.js +++ b/server/server.js @@ -58,8 +58,7 @@ app.use('/api', projects); app.use('/', serverRoutes); // configure passport -// const passportConfig = require('./config/passport'); -require('./config/passport'); +const passportConfig = require('./config/passport'); // Connect to MongoDB // mongoose.connect(process.env.MONGODB_URI || process.env.MONGOLAB_URI);