diff --git a/src/components/applicationcardAdmins.js b/src/components/applicationcardAdmins.js
index 2ab2c16..41f7def 100644
--- a/src/components/applicationcardAdmins.js
+++ b/src/components/applicationcardAdmins.js
@@ -9,12 +9,11 @@ class ApplicationCard extends React.Component {
/** Renders all the structure with the data using the application ID */
render() {
- const applicationID = this.props.ID;
return (
-
+
}
+ cover={}
hoverable={true}>
diff --git a/src/components/applicationcardUsers.js b/src/components/applicationcardUsers.js
index 7917fb0..2882052 100644
--- a/src/components/applicationcardUsers.js
+++ b/src/components/applicationcardUsers.js
@@ -5,15 +5,15 @@ import NavImage from './navimage';
const { Meta } = Card;
-class ApplicationItem extends React.Component {
+class ApplicationCard extends React.Component {
-/** Renders the page using Application Card and filters the search query */
+/** Renders all the structure with the data using the application ID */
render() {
return(
-
+
}
+ cover={}
hoverable={true}>
@@ -22,4 +22,4 @@ class ApplicationItem extends React.Component {
}
}
-export default ApplicationItem;
\ No newline at end of file
+export default ApplicationCard;
\ No newline at end of file
diff --git a/src/components/applicationsForUsers.js b/src/components/applicationsForUsers.js
index a270ded..e4d5b5e 100644
--- a/src/components/applicationsForUsers.js
+++ b/src/components/applicationsForUsers.js
@@ -26,10 +26,9 @@ class ApplicationForUsers extends React.Component {
* @returns {object} The data about the application that is associated to the user
*/
componentDidMount() {
- const id = this.props.match.params.id; // available using withRouter()
+ const id = this.props.match.params.id;
const username = this.context.user.username
const password = this.context.user.password
- const userid = this.context.user.ID
fetch(`https://animal-hello-3000.codio-box.uk/api/v1/applications/myapplications/${id}`, {
method: 'GET',
headers: {
@@ -42,7 +41,7 @@ class ApplicationForUsers extends React.Component {
this.setState({application:application})
})
.catch(err => {
- console.log(`Fetch error for application ${userid}`)
+ console.log('Fetch error for application')
});
};
@@ -67,7 +66,7 @@ render() {
-
+
{application.companyName}
diff --git a/src/components/contact.js b/src/components/contact.js
index 30a011c..1b8232e 100644
--- a/src/components/contact.js
+++ b/src/components/contact.js
@@ -2,7 +2,7 @@ import React from 'react';
import UserContext from '../contexts/user';
import { Typography, Button, Input } from 'antd';
import { withRouter } from 'react-router';
-import emailjs from 'emailjs-com';
+
const { Title } = Typography;
const { TextArea } = Input;
@@ -25,6 +25,7 @@ class ContactForm extends React.Component {
*/
sendEmail(e){
e.preventDefault();
+ const emailjs = require("emailjs-com")
emailjs.sendForm('gmail', 'template_tld', e.target, 'user_4pQL25dW7YNzoZmVCML9j') //Details to identify the emailjs account and template
.then((result) => {
diff --git a/src/components/newApplication.js b/src/components/newApplication.js
index 28f9ee4..c8a9090 100644
--- a/src/components/newApplication.js
+++ b/src/components/newApplication.js
@@ -2,7 +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";
+import { withRouter } from 'react-router';
const { Title } = Typography;
@@ -69,6 +69,7 @@ class NewApplication extends React.Component {
.then(data => {
console.log(data)
alert("Application added!")
+ this.props.history.push('/')
})
.catch(err => {
console.log(err)
@@ -124,7 +125,6 @@ class NewApplication extends React.Component {
-
@@ -133,4 +133,4 @@ class NewApplication extends React.Component {
};
};
-export default NewApplication;
\ No newline at end of file
+export default withRouter(NewApplication);
\ No newline at end of file
diff --git a/src/components/register.js b/src/components/register.js
index be52e9e..639d933 100644
--- a/src/components/register.js
+++ b/src/components/register.js
@@ -1,7 +1,7 @@
import React from 'react';
import { Form, Input, Button, Typography } from 'antd';
import { status, json } from '../utilities/requestHandlers';
-import { Link } from 'react-router-dom';
+import { withRouter } from 'react-router';
const { Title } = Typography;
@@ -96,6 +96,7 @@ class RegistrationForm extends React.Component {
.then(data => {
console.log(data);
alert("User added!")
+ this.props.history.push('/login')
})
.catch(err => {
alert("Error adding user!");
@@ -143,11 +144,10 @@ class RegistrationForm extends React.Component {
-
);
};
};
-export default RegistrationForm;
+export default withRouter(RegistrationForm);
diff --git a/src/components/usercard.js b/src/components/usercard.js
index 9816239..3469719 100644
--- a/src/components/usercard.js
+++ b/src/components/usercard.js
@@ -9,12 +9,11 @@ class UserCard extends React.Component {
/** Renders all the structure with the data using the user ID */
render() {
- const userID = this.props.ID;
return (
-
+
}
+ cover={}
hoverable={true}>
diff --git a/src/components/usersgrid.js b/src/components/usersgrid.js
index 6e7bec6..e760fad 100644
--- a/src/components/usersgrid.js
+++ b/src/components/usersgrid.js
@@ -81,7 +81,7 @@ class UsersGrid extends React.Component {
});
return (