From 912e1b96bfa7d6c022d854fa744f719b49ca98d0 Mon Sep 17 00:00:00 2001 From: Georgios Andreadis Date: Tue, 21 Jul 2020 15:33:37 +0200 Subject: Add first plotting attempts for portfolios --- .../components/navigation/AppNavbarComponent.js | 6 +-- frontend/src/components/navigation/HomeNavbar.js | 12 +++--- frontend/src/components/navigation/LogoutButton.js | 2 +- frontend/src/components/navigation/Navbar.js | 43 +++++++--------------- 4 files changed, 22 insertions(+), 41 deletions(-) (limited to 'frontend/src/components/navigation') diff --git a/frontend/src/components/navigation/AppNavbarComponent.js b/frontend/src/components/navigation/AppNavbarComponent.js index 10a2b92c..293049e1 100644 --- a/frontend/src/components/navigation/AppNavbarComponent.js +++ b/frontend/src/components/navigation/AppNavbarComponent.js @@ -8,7 +8,7 @@ const AppNavbarComponent = ({ project, fullWidth }) => ( - + My Projects @@ -18,9 +18,7 @@ const AppNavbarComponent = ({ project, fullWidth }) => ( {project.name} - ) : ( - undefined - )} + ) : undefined} ) diff --git a/frontend/src/components/navigation/HomeNavbar.js b/frontend/src/components/navigation/HomeNavbar.js index 4e3f3869..798d1b97 100644 --- a/frontend/src/components/navigation/HomeNavbar.js +++ b/frontend/src/components/navigation/HomeNavbar.js @@ -12,12 +12,12 @@ const ScrollNavItem = ({ id, name }) => ( const HomeNavbar = () => ( - - - - - - + + + + + + ) diff --git a/frontend/src/components/navigation/LogoutButton.js b/frontend/src/components/navigation/LogoutButton.js index 905e1ae9..e3de2ec7 100644 --- a/frontend/src/components/navigation/LogoutButton.js +++ b/frontend/src/components/navigation/LogoutButton.js @@ -5,7 +5,7 @@ import { Link } from 'react-router-dom' const LogoutButton = ({ onLogout }) => ( - + ) diff --git a/frontend/src/components/navigation/Navbar.js b/frontend/src/components/navigation/Navbar.js index 0ef19ecb..b1f1f7ae 100644 --- a/frontend/src/components/navigation/Navbar.js +++ b/frontend/src/components/navigation/Navbar.js @@ -9,10 +9,8 @@ import './Navbar.css' export const NAVBAR_HEIGHT = 60 -export const NavItem = withRouter(props => ) -export const LoggedInSection = withRouter(props => ( - -)) +export const NavItem = withRouter((props) => ) +export const LoggedInSection = withRouter((props) => ) const GitHubLink = () => ( ( className="ml-2 mr-3 text-dark" style={{ position: 'relative', top: 7 }} > - + ) const NavItemWithoutRoute = ({ route, location, children }) => ( -
  • - {children} -
  • +
  • {children}
  • ) const LoggedInSectionWithoutRoute = ({ location }) => ( @@ -48,28 +39,25 @@ const LoggedInSectionWithoutRoute = ({ location }) => ( ) : ( - + ), - + , ] ) : ( - - + + )} ) const Navbar = ({ fullWidth, children }) => ( -