Merge pull request #16 from turniere/ticket/TURNIERE-140

Format the errors after failed register or login
This commit is contained in:
betanummeric 2019-04-22 16:44:33 +02:00 committed by GitHub
commit 662050d60b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 8 deletions

View File

@ -8,6 +8,8 @@ import {
clearErrors clearErrors
} from '../api'; } from '../api';
import '../../static/css/errormessages.css';
export function Login(props) { export function Login(props) {
return ( return (
<Container className="py-5"> <Container className="py-5">
@ -31,7 +33,7 @@ class LoginErrorList extends React.Component {
const { error, errorMessages } = this.props; const { error, errorMessages } = this.props;
if(error) { if(error) {
return ( return (
<ul className='text-danger mt-3'> <ul className='mt-3 error-box'>
{ errorMessages.map((message, index) => { errorMessages.map((message, index) =>
<li key={index}> <li key={index}>
{message} {message}

View File

@ -20,10 +20,10 @@ import {
clearErrors clearErrors
} from '../js/api'; } from '../js/api';
import '../static/css/errormessages.css';
import '../static/everypage.css'; import '../static/everypage.css';
export default class RegisterPage extends React.Component { export default class RegisterPage extends React.Component {
render() { render() {
return ( return (
<div className="main generic-fullpage-bg"> <div className="main generic-fullpage-bg">
@ -42,7 +42,6 @@ export default class RegisterPage extends React.Component {
} }
class Register extends React.Component { class Register extends React.Component {
componentDidMount() { componentDidMount() {
clearErrors(); clearErrors();
} }
@ -69,11 +68,9 @@ class RegisterErrorList extends React.Component {
const { error, errorMessages } = this.props; const { error, errorMessages } = this.props;
if(error) { if(error) {
return ( return (
<ul className='text-danger mt-3'> <ul className="mt-3 error-box">
{ errorMessages.map((message, index) => { errorMessages.map((message, index) =>
<li key={index}> <li key={index}>{message}</li>
{message}
</li>
) } ) }
</ul> </ul>
); );
@ -93,7 +90,6 @@ const VisibleRegisterErrorList = connect(
)(RegisterErrorList); )(RegisterErrorList);
class RegisterForm extends React.Component { class RegisterForm extends React.Component {
constructor(props) { constructor(props) {
super(props); super(props);

View File

@ -0,0 +1,12 @@
.error-box {
border: 2px solid #dc3545;
border-radius: 4px;
padding: 8px 16px;
}
.error-box > li {
color: #dc3545;
margin-right: 36px;
list-style-type: none;
}