Merge pull request #10 from ZBoxApp/login

Login with panel merge to master

src/components/login/login.jsx

@@ -6,6 +6,7 @@ import React from 'react';
 import {browserHistory} from 'react-router';
 
 import * as Client from '../../utils/client.jsx';
+import Panel from '../panel.jsx';
 import LoginEmail from './login_email.jsx';
 import MessageBar from '../message_bar.jsx';
 
@@ -88,24 +89,16 @@ export default class Login extends React.Component {
             <div className='login-container'>
                 <div className='row'>
                     <div className='col-md-12'>
-                        <div className='hpanel'>
-                            {loginError}
-                            <div
-                                className='panel-body'
-                                style={{paddingLeft: '80px', paddingRight: '80px', paddingBottom: '60px'}}
-                            >
-                                <h2
-                                    className='text-center'
-                                    style={{marginBottom: '50px'}}
-                                >
-                                    {'Ingreso a ZBox Manager'}
-                                </h2>
+                        <Panel
+                            hasHeader={false}
+                            error={loginError}
+                            children={(
                                 <LoginEmail
                                     submit={this.submit}
                                     loginError={this.state.loginError}
                                 />
-                            </div>
-                        </div>
+                            )}
+                        />
                     </div>
                 </div>
                 <div className='row'>

src/components/login/login_email.jsx

@@ -31,7 +31,13 @@ export default class LoginEmail extends React.Component {
 
         return (
             <form onSubmit={this.handleSubmit}>
-                <div className='signup__email-container'>
+                <div className=''>
+                    <h2
+                        className='text-center'
+                        style={{marginBottom: '50px'}}
+                    >
+                        {'Ingreso a ZBox Manager'}
+                    </h2>
                     <div className={'form-group' + errorClass}>
                         <input
                             autoFocus={true}

src/components/panel.jsx

@@ -14,14 +14,22 @@ export default class Panel extends React.Component {
             );
         });
 
-        return (
-            <div className='hpanel'>
+        let panelHeader;
+        if (this.props.hasHeader) {
+            panelHeader = (
                 <div className='panel-heading hbuilt clearfix'>
                     <div className='pull-right'>{btns}</div>
                     <div className='heading-buttons'>
                         {this.props.title}
                     </div>
                 </div>
+            );
+        }
+
+        return (
+            <div className='hpanel'>
+                {panelHeader}
+                {this.props.error}
                 <div className='panel-body'>
                     {this.props.children}
                 </div>
@@ -31,12 +39,16 @@ export default class Panel extends React.Component {
 }
 
 Panel.propTypes = {
+    hasHeader: React.PropTypes.bool,
     btnsHeader: React.PropTypes.array,
     title: React.PropTypes.string,
+    error: React.PropTypes.element,
     children: React.PropTypes.any
 };
 
 Panel.defaultProps = {
+    hasHeader: true,
     btnsHeader: [],
-    title: ''
+    title: '',
+    error: null
 };

src/index.jsx

@@ -16,10 +16,10 @@ import * as Client from './utils/client.jsx';
 import * as Utils from './utils/utils.jsx';
 
 const notFoundParams = {
-    title: 'Page not found',
-    message: 'The page you where trying to reach does not exist',
-    link: '/logout',
-    linkmessage: 'Back to Manager'
+    title: 'Página no encontrada',
+    message: 'La página que estás intentando acceder no existe',
+    link: '/',
+    linkmessage: 'Volver a Manager'
 };
 
 function preRenderSetup(callwhendone) {