Changed nav format

6003CEM-2021JANMAY · Jun 30, 2021 · 25bb01b · 25bb01b
1 parent 580f06e
commit 25bb01b
Showing 9 changed files with 42 additions and 31 deletions.
diff --git a/src/components/account.js b/src/components/account.js
@@ -18,10 +18,10 @@ function Account(props) {
   const [profile, setProfile] = React.useState({});
 
   if (!user.loggedIn) {
-    alert("Please log in")
+			<h2>Please login in order to see your account details</h2>
   }
 
-  if (!profile.username) {
+	 else if (!profile.username) {
     let headers = new Headers();
     headers.append('Authorization', 'Basic ' + btoa(user.username + ":" + user.password));
 

diff --git a/src/components/admin.js b/src/components/admin.js
@@ -47,4 +47,4 @@ function Admin(props) {
   );
 }
 
-export default Admin;
+export default Admin;
diff --git a/src/components/application.js b/src/components/application.js
@@ -144,8 +144,8 @@ render() {
 						<Paragraph>Created In: {application.dateCreated}</Paragraph>
 						<Paragraph>Status: {application.status}</Paragraph>
 						<Form name="update" onFinish={this.edit}  >
-                <Form.Item rules={[{required:true}]} name="New Status" label="Change the Application Status:">
-                    <Select placeholder="Select the new status">
+                <Form.Item rules={[{required:true, message:'Select the Application Status'}]} name="status" label="Change the Application Status:">
+                    <Select placeholder="Status">
 											<Option value="Pending">Pending</Option>
 											<Option value="Accepted">Accepted</Option>
 											<Option value="Rejected">Rejected</Option>
@@ -170,4 +170,4 @@ render() {
 }
 }
 
-export default withRouter(Application);
+export default withRouter(Application);
diff --git a/src/components/applicationcard.js b/src/components/applicationcard.js
@@ -10,7 +10,6 @@ class ApplicationCard extends React.Component {
 /** Renders all the structure with the data using the application ID */
   render() {
     const imagesrc = "https://animal-hello-3000.codio-box.uk/api/v1/applications" + this.props.image
-    console.log(this.props.image)
     const applicationID = this.props.ID;
     const companyName = this.props.companyName
     return (
@@ -27,4 +26,4 @@ class ApplicationCard extends React.Component {
   }
 }
 
-export default ApplicationCard;
+export default ApplicationCard;
diff --git a/src/components/homegrid.js b/src/components/homegrid.js
@@ -54,8 +54,6 @@ class HomeGrid extends React.Component {
       return (
         <h2>You have to be a user in order to see applications!</h2>
       )
-		}if (!this.state.application) {
-      return <h3>Loading application...</h3>
 		}else {
     const applicationList = this.state.applications.map(application => {
       return (

diff --git a/src/components/login.js b/src/components/login.js
@@ -56,7 +56,6 @@ class LoginForm extends React.Component {
         .then(json)
         .then(user => {
             console.log('Logged in successfully');
-            console.log(user);
             user.password = password;  // store in context for future API calls
             this.context.login(user);
 						alert('Hello ' + username + '!')

diff --git a/src/components/nav.js b/src/components/nav.js
@@ -12,23 +12,37 @@ class Nav extends React.Component {
 	static contextType = UserContext;
 
   render() {
-		return (
-        <>
-          <div className="logo" />
-          <Menu theme="dark" mode="horizontal" defaultSelectedKeys={['1']}>
+		if (this.context.user.loggedIn) {
+			if  (this.context.user.role!="user") {
+      return (
+				<Menu theme="dark" mode="horizontal" defaultSelectedKeys={['1']}>
+						<Menu.Item key="1" disabled={this.context.user.role!= "admin"}><Link to="/adminSpace">Admin</Link></Menu.Item>
+						<Menu.Item key="2" disabled={!this.context.user.loggedIn}><Link to="/account">Account</Link></Menu.Item>
+						<Menu.Item key="3" disabled={!this.context.user.loggedIn}><Link to="/messages">Chat</Link></Menu.Item>
+            <Menu.Item key="4" disabled={!this.context.user.loggedIn} onClick={this.context.logout}> <Link to="/">Logout</Link></Menu.Item>
+         </Menu>
+      )
+			}if (this.context.user.role!="admin") {
+				return(
+					<Menu theme="dark" mode="horizontal" defaultSelectedKeys={['1']}>
+						<Menu.Item key="1" disabled={this.context.user.role!= "user"}><Link to={`/myapplication/${this.context.user.ID}`}>My Application</Link></Menu.Item>
+						<Menu.Item key="2" disabled={this.context.user.role!= "user"}><Link to="/newapplication">Add Application</Link></Menu.Item>
+						<Menu.Item key="3" disabled={!this.context.user.loggedIn}><Link to="/account">Account</Link></Menu.Item>
+            <Menu.Item key="4" disabled={!this.context.user.loggedIn}><Link to="/messages">Chat</Link></Menu.Item>
+						<Menu.Item key="5" disabled={!this.context.user.loggedIn} onClick={this.context.logout}> <Link to="/">Logout</Link></Menu.Item>
+				</Menu>
+				)
+			}
+		}else{
+			return(
+				<Menu theme="dark" mode="horizontal" defaultSelectedKeys={['1']}>
 						<Menu.Item key="1" disabled={this.context.user.loggedIn}><Link to="/">Home</Link></Menu.Item>						
             <Menu.Item key="2" disabled={this.context.user.loggedIn}><Link to="/login">Login</Link></Menu.Item>
             <Menu.Item key="3" disabled={this.context.user.loggedIn}><Link to="/register">Register</Link></Menu.Item>
-						<Menu.Item key="4" disabled={!this.context.user.loggedIn}><Link to="/account">Account</Link></Menu.Item>
-						<Menu.Item key="5" disabled={this.context.user.role!= "user"}><Link to={`/myapplication/${this.context.user.ID}`}>My Application</Link></Menu.Item>
-						<Menu.Item key="6" disabled={this.context.user.role!= "user"}><Link to="/newapplication">Add Application</Link></Menu.Item>
-            <Menu.Item key="7" disabled={!this.context.user.loggedIn}><Link to="/messages">Chat</Link></Menu.Item>
-						<Menu.Item key="8" disabled={this.context.user.role!= "admin"}><Link to="/adminSpace">Admin</Link></Menu.Item>
-            <Menu.Item key="9" disabled={!this.context.user.loggedIn} onClick={this.context.logout}> <Link to="/">Logout</Link></Menu.Item>
-          </Menu>
-        </>
-		)
-	};
+				</Menu>
+			)
+		}
+}
 };
 
 export default Nav;
diff --git a/src/components/newApplication.js b/src/components/newApplication.js
@@ -2,6 +2,7 @@ import React from 'react';
 import { status, json } from '../utilities/requestHandlers';
 import { Form, Input, Button, Typography, DatePicker } from 'antd';
 import UserContext from '../contexts/user';
+import { Link } from "react-router-dom";
 
 const { Title } = Typography;
 
@@ -11,7 +12,7 @@ const nameRule=[
     {required:true,message:'Please type the name of the compnay.',whitespace:false, min:5,max:150}
 ]
 const crnRule=[
-    {required:true, type:'number', message:'Please a valid company reference number.',whitespace:false, min:8,max:8}
+    {required:true, message:'Please a valid company reference number.',whitespace:false, min:8,max:8}
 ]
 const addressRule=[
     {required:true,message:'Please enter the address where the company is located.',whitespace:false, min:5,max:32}
@@ -60,8 +61,9 @@ class NewApplication extends React.Component {
     .then(status)
     .then(json)
     .then(data => {
-			this.setState({redirect:'/applications/myapplications'}); //Fix this to redirect to the application page!!
-      alert("Application added!")
+			console.log(data)
+			alert("Application added!")
+			this.setState({redirect:`/myapplication/${this.context.user.id}`});
     })
     .catch(err => {
       alert("Error occurred, try again!")
@@ -114,6 +116,7 @@ class NewApplication extends React.Component {
 
           <Form.Item {...tailFormItemLayout}>
             <Button type="primary" htmlType="submit">Submit Application</Button>
+						<Button> <Link to ={`/myapplication/${this.context.user.ID}`}>Click here to see your application!</Link></Button>
           </Form.Item>
         </Form>
 

diff --git a/src/components/register.js b/src/components/register.js
@@ -134,9 +134,7 @@ class RegistrationForm extends React.Component {
         </Form.Item>
 
         <Form.Item {...tailFormItemLayout}>
-            <Button type="primary" htmlType="submit">
-                Register
-            </Button>
+            <Button type="primary" htmlType="submit">Register</Button>
         </Form.Item>
       </Form>
     );