Fixing after react update

client/src/components/profile-forms/AddEducation.js

@@ -34,7 +34,11 @@ const AddEducation = ({ addEducation }) => {
         className="form"
         onSubmit={(e) => {
           e.preventDefault();
+<<<<<<< HEAD
+          addEducation(formData).then(() => navigate('/dashboard'));
+=======
           addEducation(formData, navigate);
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
         }}
       >
         <div className="form-group">
@@ -115,4 +119,8 @@ AddEducation.propTypes = {
   addEducation: PropTypes.func.isRequired
 };
 
-export default connect(null, { addEducation })(AddEducation);
+<<<<<<< HEAD
+export default connect(null, { addEducation })(AddEducation);
+=======
+export default connect(null, { addEducation })(AddEducation);
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb

client/src/components/profile-forms/AddExperience.js

@@ -33,7 +33,11 @@ const AddExperience = ({ addExperience }) => {
         className="form"
         onSubmit={(e) => {
           e.preventDefault();
+<<<<<<< HEAD
+          addExperience(formData).then(() => navigate('/dashboard'));
+=======
           addExperience(formData, navigate);
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
         }}
       >
         <div className="form-group">
@@ -116,4 +120,8 @@ AddExperience.propTypes = {
   addExperience: PropTypes.func.isRequired
 };
 
-export default connect(null, { addExperience })(AddExperience);
+<<<<<<< HEAD
+export default connect(null, { addExperience })(AddExperience);
+=======
+export default connect(null, { addExperience })(AddExperience);
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb

client/src/components/profile-forms/ProfileForm.js

@@ -78,8 +78,16 @@ const ProfileForm = ({
     setFormData({ ...formData, [e.target.name]: e.target.value });
 
   const onSubmit = (e) => {
+<<<<<<< HEAD
+    const editing = profile ? true : false;
+    e.preventDefault();
+    createProfile(formData, editing).then(() => {
+      if (!editing) navigate('/dashboard');
+    });
+=======
     e.preventDefault();
     createProfile(formData, navigate, profile ? true : false);
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb
   };
 
   return (
@@ -273,4 +281,8 @@ const mapStateToProps = (state) => ({
 
 export default connect(mapStateToProps, { createProfile, getCurrentProfile })(
   ProfileForm
-);
+<<<<<<< HEAD
+);
+=======
+);
+>>>>>>> cc38df43629d64ca77f694c971a13a026b3afcfb