diff options
| author | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2017-08-15 23:24:28 +0300 |
|---|---|---|
| committer | Georgios Andreadis <g.andreadis@student.tudelft.nl> | 2017-09-23 10:05:42 +0200 |
| commit | 91c8088e1d7def9242f60c708cd34f25dcb77d76 (patch) | |
| tree | b68065019692cea5cf6c3d14b811104aff2f0879 /src/components | |
| parent | d7512ace72448242b392299cf459c9c72c8dbee5 (diff) | |
Connect to backend and fetch initial project data
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/modals/Modal.js | 1 | ||||
| -rw-r--r-- | src/components/navigation/Navbar.js | 5 | ||||
| -rw-r--r-- | src/components/projects/ProjectAuthList.sass | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/components/modals/Modal.js b/src/components/modals/Modal.js index e7054fec..c4f10b29 100644 --- a/src/components/modals/Modal.js +++ b/src/components/modals/Modal.js @@ -26,7 +26,6 @@ class Modal extends React.Component { window["$"]("#" + this.id).on("hide.bs.modal", () => { if (this.visible) { this.props.onCancel(); - console.log("TEST"); } }); } diff --git a/src/components/navigation/Navbar.js b/src/components/navigation/Navbar.js index bbd08591..96dd93b4 100644 --- a/src/components/navigation/Navbar.js +++ b/src/components/navigation/Navbar.js @@ -3,6 +3,7 @@ import FontAwesome from "react-fontawesome"; import Mailto from "react-mailto"; import {Link} from "react-router-dom"; import Logout from "../../containers/auth/Logout"; +import ProfileName from "../../containers/auth/ProfileName"; import "./Navbar.css"; class Navbar extends Component { @@ -23,7 +24,9 @@ class Navbar extends Component { headers={{subject: "OpenDC Support"}}> <FontAwesome name="question-circle" size="lg"/> </Mailto> - <Link className="username" title="My Profile" to="/profile">Profile</Link> + <Link className="username" title="My Profile" to="/profile"> + <ProfileName/> + </Link> <Logout/> </div> </div> diff --git a/src/components/projects/ProjectAuthList.sass b/src/components/projects/ProjectAuthList.sass index 1c65305e..5cdfacaa 100644 --- a/src/components/projects/ProjectAuthList.sass +++ b/src/components/projects/ProjectAuthList.sass @@ -48,10 +48,13 @@ span margin-right: 10px +.project-row .project-icons + text-align: right + .project-row .project-icons div display: inline position: relative - top: 5px + top: 4px width: 30px height: 30px margin-right: 5px |