Merge pull request #118 from FAC-Sixteen/feature/css

update names
FAC-Sixteen · Jun 21, 2019 · 5c86ab5 · 5c86ab5
2 parents 8c08cbc + a82c8ac
commit 5c86ab5
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 23 deletions.
diff --git a/src/components/Homepage/Founders/Founders.js b/src/components/Homepage/Founders/Founders.js
@@ -1,35 +1,30 @@
 import React from "react";
 import "./Founders.css";
 import Founder from "./Founder/Founder";
-<<<<<<< HEAD
-=======
-import { Link } from 'react-router-dom';
-
->>>>>>> master
 
 const Founders = () => {
   return (
     <div className="FoundersComponent">
       <h2 className="FoundersComponent--header">From the Founders</h2>
       <div className="FoundersComponent--container">
         <Founder
-          name="Dan Foster"
+          name="Alex Foster"
           src="https://user-images.githubusercontent.com/33389104/59862163-3110f980-937a-11e9-96c4-c6616dc20b43.jpeg"
           position="CEO"
           instagram="#"
           twitter="#"
           facebook="#"
         />
         <Founder
-          name="James Foster"
+          name="Max Adorian"
           src="https://user-images.githubusercontent.com/33389104/59861571-04a8ad80-9379-11e9-9a99-5a8c26140a4c.jpeg"
           position="COO"
           instagram="#"
           twitter="#"
           facebook="#"
         />
         <Founder
-          name="Pete Foster"
+          name="Joe Major"
           src="https://user-images.githubusercontent.com/33389104/59861571-04a8ad80-9379-11e9-9a99-5a8c26140a4c.jpeg"
           position="CTO"
           instagram="#"
@@ -43,16 +38,7 @@ const Founders = () => {
         out to find a solution, which led us to Groundworks. Our way to
         revolutionise how companies connect with students worldwide.
       </p>
-<<<<<<< HEAD
-
       <button className="FoundersComponent--joinbutton">Join</button>
-=======
-      <Link to='/Join'>
-      <button className="FoundersComponent--joinbutton">
-        Join
-      </button>
-      </Link>
->>>>>>> master
     </div>
   );
 };

diff --git a/src/components/Homepage/Testimonials/Testimonials.js b/src/components/Homepage/Testimonials/Testimonials.js
@@ -14,7 +14,7 @@ const Testimonials = () => {
         real-life work experience and a sense of career direction."
       </p>
       <span className="testimonials--span">
-        Steven, University of Briston, 2019
+        Steven, University of Bristol, 2019
       </span>
     </div>
   );

diff --git a/src/components/StudentDashboard/ShortStudentProfileCard/ShortStudentProfileCard.js b/src/components/StudentDashboard/ShortStudentProfileCard/ShortStudentProfileCard.js
@@ -7,7 +7,9 @@ const ShortStudentProfileCard = () => {
 
   useEffect(() => {
     const fetchData = async () => {
-      const result = await axios("/api/student/get-student/5d0783ded1ea443e7621cc88");
+      const result = await axios(
+        "/api/student/get-student/5d0783ded1ea443e7621cc88"
+      );
       console.log(result.data);
       setProfile(result.data);
     };
@@ -18,10 +20,10 @@ const ShortStudentProfileCard = () => {
   return (
     <div>
       <ShortStudentProfile
-        name={profile.firstName}
-        university={profile.university}
-        year={profile.yearOfStudy}
-        course={profile.courseStudied}
+      // name={profile.firstName}
+      // university={profile.university}
+      // year={profile.yearOfStudy}
+      // course={profile.courseStudied}
       />
     </div>
   );