Final commit

src/components/account.js

@@ -1,15 +1,13 @@
 import React from 'react';
 import { withRouter } from 'react-router';
-import { Image, Row, Col, Typography, Space, Button, Form, Select, Input } from 'antd';
+import { Image, Row, Col, Typography, Button, Form, Input } from 'antd';
 import { status, json } from '../utilities/requestHandlers';
 import { Link } from "react-router-dom";
 
 import UserContext from '../contexts/user';
 
 const { Title, Paragraph } = Typography;
 
-const { Option } = Select;
-
 class Account extends React.Component {
 
 	static contextType = UserContext;
@@ -82,7 +80,12 @@ class Account extends React.Component {
 render() {
 
   const user = this.state.user;
-
+
+	 if (!this.context.user.loggedIn) {
+			return (
+        <h2>Login first in order to see your account details!</h2>
+      )
+	 }
 
 /** Returns the data about the user */
    return(
@@ -100,13 +103,13 @@ render() {
 
 				<h1>Change your account details here:</h1>
           <Form name="update" onFinish={this.edit}  >
-						<Form.Item rules={[{required:false, message:'Change your new name'}]} name="firstName" label="First name:">
+						<Form.Item rules={[{required:false, message:'Input a valid first name', min:2}]} name="firstName" label="First name:">
                   <Input />
               </Form.Item>
-						<Form.Item rules={[{required:false, message:'Change your new name'}]} name="lastName" label="Last name:">
+						<Form.Item rules={[{required:false, message:'Input a valid last name', min:2}]} name="lastName" label="Last name:">
                   <Input />
               </Form.Item>
-              <Form.Item rules={[{required:false, message:'Change your new username'}]} name="username" label="Username:">
+              <Form.Item rules={[{required:false, message:'Input a valid username', min:3}]} name="username" label="Username:">
                   <Input />
               </Form.Item>
 							<Form.Item rules={[{required:false,type:'email', message:'Input a valid email'}]} name="email" label="Email:">

src/components/contact.js

@@ -56,7 +56,7 @@ class ContactForm extends React.Component {
       <Input type="email" name="email" required/>
 			<label>Subject: </label>
       <Input name="subject" required/>
-      <label class="label">Message: </label>
+      <label >Message: </label>
       <TextArea name="message" required/>
       <Button type="primary" htmlType="submit">Send</Button>
 			</div>

src/components/register.js

@@ -17,15 +17,15 @@ const tailFormItemLayout = {
 
 /** Rules for form inputs */
 const firstNameRules = [
-    {required: false, message: 'Please enter your First Name!' }
+    {required: false, message: 'The input is not a valid First Name!' , min:2 }
 ];
 
 const lastNameRules = [
-    {required: false, message: 'Please enter your Last Name!' }
+    {required: false, message: 'The input is not a valid Last Name!', min:2 }
 ];
 
 const emailRules = [
-    {type: 'email', message: 'The input is not valid E-mail!'},
+    {type: 'email', message: 'The input is not a valid E-mail!'},
     {required: true, message: 'Please input your E-mail!' }
 ];
 

src/components/usersinfo.js

@@ -62,11 +62,11 @@ class User extends React.Component {
     })
     .then(status)
     .then(user => {
-      alert(`Deleted user for company ${this.state.user.companyName}`);
-      this.props.history.push('/adminSpace')
+      alert(`Deleted user ${this.state.user.username}`);
+      this.props.history.push('/users')
     })
     .catch(error => {
-      console.log('Delete failed' + error);
+      console.log('Delete failed');
     });
   }