--- a/client/src/components/Login.js Wed Aug 29 11:02:36 2018 +0200
+++ b/client/src/components/Login.js Fri Aug 31 15:14:18 2018 +0200
@@ -3,7 +3,7 @@
import { bindActionCreators } from 'redux';
import '../App.css';
import './Login.css';
-import Navbar from './Navbar';
+// import Navbar from './Navbar';
import * as authActions from '../actions/authActions';
class Login extends Component {
@@ -32,7 +32,6 @@
submit = (e) => {
e.preventDefault();
-
this.login();
}
@@ -44,7 +43,7 @@
renderErrorMessage(errorMessages, fieldname) {
if (errorMessages && errorMessages.has(fieldname)) {
return errorMessages.get(fieldname).map((message, key) =>
- <p className="help-block" key={ key }>{ message }</p>
+ <p className="form-text" key={ key }>{ message }</p>
);
}
}
@@ -64,30 +63,30 @@
render() {
- const errorMessages = this.props.login.get('errorMessages');
+ // const errorMessages = this.props.login.get('errorMessages');
return (
<div>
- <Navbar history={this.props.history} />
+ {/* <Navbar history={this.props.history} /> */}
<div className="container-fluid">
<div className="row">
- <div className="col-md-6 col-md-offset-3">
+ <div className="col-lg-6 offset-md-3">
<div className="panel-login panel panel-default">
- <div className="panel-heading">
- <h4 className="text-center panel-title">IRI Notes</h4>
+ <div className="card-header bg-secondary border-0">
+ <h4 className="text-center card-title">IRI Notes</h4>
<form onSubmit={this.submit}>
- <div className="form-group" validationState={ errorMessages && errorMessages.has('username') ? 'error' : null }>
- <label className="control-label">Nom d'utilisateur</label>
- <input className="form-control" type="text" onChange={this.handleInputChange} name="username" />
- { this.renderErrorMessage(errorMessages, 'username') }
+ <div className="form-group" /*validationState={ errorMessages && errorMessages.has('username') ? 'error' : null }*/>
+ <label className="col-form-label text-primary">Nom d'utilisateur</label>
+ <input className="form-control bg-danger text-muted" type="text" onChange={this.handleInputChange} name="username" />
+ {/* { this.renderErrorMessage(errorMessages, 'username') } */}
</div>
- <div className="form-group" validationState={ errorMessages && errorMessages.has('password') ? 'error' : null }>
- <label className="control-label">Mot de passe</label>
- <input className="form-control" type="password" onChange={this.handleInputChange} name="password" />
- { this.renderErrorMessage(errorMessages, 'password') }
+ <div className="form-group" /*validationState={ errorMessages && errorMessages.has('password') ? 'error' : null*/ >
+ <label className="col-form-label text-primary">Mot de passe</label>
+ <input className="form-control bg-danger text-muted" type="password" onChange={this.handleInputChange} name="password" />
+ {/* { this.renderErrorMessage(errorMessages, 'password') } */}
</div>
- { this.renderNonFieldErrors(errorMessages) }
- <button type="submit" className="btn btn-primary btn-lg">Se connecter</button>
+ {/* { this.renderNonFieldErrors(errorMessages) } */}
+ <button type="submit" className="btn btn-primary btn-lg text-secondary">Se connecter</button>
</form>
</div>
</div>