Merge pull request #126 from FAC-Sixteen/Fixes/bugs

Fixes/bugs
FAC-Sixteen · Jun 28, 2019 · 0fe9d6d · 0fe9d6d
2 parents 41b3a77 + a65597d
commit 0fe9d6d
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 94 deletions.
diff --git a/src/components/LoginRegister/LoginPortal/LoginPortal.js b/src/components/LoginRegister/LoginPortal/LoginPortal.js
@@ -29,8 +29,10 @@ const LoginPortal = props => {
       } catch (error) {
         console.error(error);
       }
-    };
-    validate();
+    }
+    validate()
+    setDetails({ email: "", password: "" });
+    setText({text:"Please enter your information"});
   };
 
   return (

diff --git a/src/components/LoginRegister/RegisterPortal/RegisterPortal.js b/src/components/LoginRegister/RegisterPortal/RegisterPortal.js
@@ -5,7 +5,7 @@ import axios from "axios";
 
 const RegisterPortal = props => {
   const [user, setUser] = useState("");
-  const [data, setData] = useState({
+  const [details, setDetails] = useState({
     userName: "",
     email: "",
     password: "",
@@ -16,32 +16,36 @@ const RegisterPortal = props => {
     courseStudied: "",
     skills: "",
     aboutYou: "",
-    LinkedinURL: ""
+    LinkedinURL: "",
+    photoURL: "",
+    text: "Please press submit when complete"
   });
 
   const handleChange = event => {
-    setData({
-      ...data,
+    setDetails({
+      ...details,
       [event.target.name]: event.target.value,
       userType: user
     });
   };
 
   const handleSubmit = event => {
     event.preventDefault();
-    console.log(data);
+    console.log(details);
     console.log(user);
     console.log(props);
 
     const addRegister = async () => {
-      console.log(`Fake submitting: ${data}`);
+      console.log(`Fake submitting: ${details}`);
       console.log(user);
       try {
-        const response = await axios.post(`/api/${user}/sign-up`, data);
+        const response = await axios.post(`/api/${user}/sign-up`, details)
         if (response.status === 200) {
           // check if response status is ok
           props.history.push("/StudentDashboard");
           //success scenario
+        } else if (response.status === 400) {
+          setDetails({ text: data.msg })
         }
       } catch (error) {
         console.error(error);
@@ -50,7 +54,7 @@ const RegisterPortal = props => {
     addRegister();
     // props.history.push("/StudentDashboard");
 
-    setData({
+    setDetails({
       userName: "",
       email: "",
       password: "",
@@ -61,7 +65,9 @@ const RegisterPortal = props => {
       courseStudied: "",
       skills: "",
       aboutYou: "",
-      LinkedinURL: ""
+      LinkedinURL: "",
+      photoURL: "",
+      text: ""
     });
   };
 
@@ -93,91 +99,43 @@ const RegisterPortal = props => {
         </fieldset>
 
         <h2 className="form--el form--input__title">Name</h2>
-        <input
-          className="form--el input"
-          type="text"
-          onChange={handleChange}
-          name="userName"
-          value={data.userName}
-        />
+        <input className="form--el input" type="text" onChange={handleChange}
+          name="userName" value={details.userName} />
         <h2 className="form--el form--input__title">Email</h2>
-        <input
-          className="form--el input"
-          type="text"
-          onChange={handleChange}
-          name="email"
-          value={data.email}
-        />
+        <input className="form--el input" type="text" onChange={handleChange}
+          name="email" value={details.email} />
         <h2 className="form--el form--input__title">Password</h2>
-        <input
-          className="form--el input"
-          type="text"
-          onChange={handleChange}
-          name="password"
-          value={data.password}
-        />
+        <input className="form--el input" type="text" onChange={handleChange}
+          name="password" value={details.password} />
         <h2 className="form--el form--input__title">Phone</h2>
-        <input
-          className="form--el input"
-          type="text"
-          onChange={handleChange}
-          name="phoneNumber"
-          value={data.phoneNumber}
-        />
+        <input className="form--el input" type="text" onChange={handleChange}
+          name="phoneNumber" value={details.phoneNumber} />
         <h2 className="form--el form--input__title">University</h2>
-        <input
-          className="form--el input"
-          type="text"
-          onChange={handleChange}
-          name="university"
-          value={data.university}
-        />
+        <input className="form--el input" type="text" onChange={handleChange}
+          name="university" value={details.university} />
         <h2 className="form--el form--input__title">Year of Study</h2>
-        <input
-          className="form--el input"
-          type="text"
-          onChange={handleChange}
-          name="yearOfStudy"
-          value={data.yearOfStudy}
-        />
+        <input className="form--el input" type="text" onChange={handleChange}
+          name="yearOfStudy" value={details.yearOfStudy} />
         <h2 className="form--el form--input__title">Course of Study</h2>
-        <input
-          className="form--el input"
-          type="text"
-          onChange={handleChange}
-          name="courseStudied"
-          value={data.courseStudied}
-        />
+        <input className="form--el input" type="text" onChange={handleChange}
+          name="courseStudied" value={details.courseStudied} />
         <h2 className="form--el form--input__title">Skills</h2>
-        <input
-          className="form--el input"
-          type="text"
-          onChange={handleChange}
-          name="skills"
-          value={data.skills}
-        />
+        <input className="form--el input" type="text" onChange={handleChange}
+          name="skills" value={details.skills} />
         <h2 className="form--el form--input__title">About You</h2>
-        <input
-          className="form--el input"
-          type="text"
-          onChange={handleChange}
-          name="aboutYou"
-          value={data.aboutYou}
-        />
+        <input className="form--el input" type="text" onChange={handleChange}
+          name="aboutYou" value={details.aboutYou} />
         <h2 className="form--el form--input__title">LinkedIn:</h2>
-        <input
-          className="form--el input"
-          type="text"
-          onChange={handleChange}
-          name="LinkedinURL"
-          value={data.LinkedinURL}
-        />
-        <input
-          className="form--button"
-          type="submit"
-          name="submit"
-          value="Register"
-        />
+        <input className="form--el input" type="text" onChange={handleChange}
+          name="LinkedinURL" value={details.LinkedinURL} />
+        <h2 className="form--el form--input__title">Photo URL:</h2>
+        <input className="form--el input" type="text" onChange={handleChange}
+          name="photoURL" value={details.photoURL} />
+
+        <h3>{details.text}</h3>
+
+        <input className="form--button" type="submit" name="submit"
+          value="Register" />
       </form>
     </div>
   );

diff --git a/src/components/StudentDashboard/CurrentJobCard/CurrentJobCard.js b/src/components/StudentDashboard/CurrentJobCard/CurrentJobCard.js
@@ -6,11 +6,12 @@ const StudentCurrentJobCard = props => {
   const [data, setData] = useState([]);
   useEffect(() => {
     const fetchData = async () => {
-      const result = await axios("/api/client/all-briefs");
+      const result = await axios("/api/brief/brief-get/5d1286b8a0aa563dc52dbbe7");
       setData(result.data);
     };
     fetchData();
   }, []);
+
   return (
     <ul className={props.StudentCurrentJobCard ? "showing" : "hidden"}>
       {data.map((value, index) => {

diff --git a/src/components/StudentDashboard/NewJobCard/NewJobCard.js b/src/components/StudentDashboard/NewJobCard/NewJobCard.js
@@ -6,7 +6,7 @@ const StudentNewJobCard = props => {
   const [data, setData] = useState([]);
   useEffect(() => {
     const fetchData = async () => {
-      const result = await axios("/api/client/all-briefs");
+      const result = await axios("/api/brief/all-briefs");
       setData(result.data);
     };
     fetchData();

diff --git a/src/components/StudentDashboard/ShortStudentProfileCard/ShortStudentProfile.js b/src/components/StudentDashboard/ShortStudentProfileCard/ShortStudentProfile.js
@@ -11,12 +11,12 @@ const ShortStudentProfile = ({ name, course, university, year }) => {
         <div>
           <img
             className="StudentProfileCard--image"
-            src="https://user-images.githubusercontent.com/32282170/59887196-0bf8a700-93cb-11e9-9016-e046470cb8e9.jpg"
+            src="https://user-images.githubusercontent.com/32282170/60135235-ed6b2500-97a9-11e9-8d60-5affb9149370.jpg"
           />
           <h4>{name}</h4>
-          <h4>{course}</h4>
+          <h4>Course: {course}</h4>
           <h4>{university}</h4>
-          <h4>Year {year}</h4>
+          <h4>Year: {year}</h4>
         </div>
       </div>
     </div>

diff --git a/src/components/StudentDashboard/ShortStudentProfileCard/ShortStudentProfileCard.js b/src/components/StudentDashboard/ShortStudentProfileCard/ShortStudentProfileCard.js
@@ -7,8 +7,8 @@ const ShortStudentProfileCard = () => {
 
   useEffect(() => {
     const fetchData = async () => {
-      const result = await axios("/api/student/get-student/5d0eae4b3065ec1b9fc1a7e4");
-      console.log(result.data);
+      const result = await axios("/api/student/get-student/5d1286b8a0aa563dc52dbbe7");
+      console.log("Results: ", result.data.completedJobs);
       setProfile(result.data);
     };