Merge pull request #9 from joeblas/navigation-fix

fixed the navigation
joeblas · Nov 17, 2017 · 12d6beb · 12d6beb
2 parents a80c1fd + c3e6e03
commit 12d6beb
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/client/main.html b/client/main.html
@@ -1,6 +1,6 @@
 <head>
   <meta charset="utf-8">
-  <title>Pup</title>
+  <title>CloudControl</title>
   <meta name="description" content="A description for the application.">
   <meta name="viewport" content="initial-scale=1, minimal-ui, maximum-scale=1, minimum-scale=1" />
   <link href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css" rel="stylesheet" />

diff --git a/imports/ui/components/AuthenticatedNavigation/AuthenticatedNavigation.js b/imports/ui/components/AuthenticatedNavigation/AuthenticatedNavigation.js
@@ -8,8 +8,11 @@ import { Meteor } from 'meteor/meteor';
 const AuthenticatedNavigation = ({ name, history }) => (
   <div>
     <Nav>
-      <LinkContainer to="/documents">
-        <NavItem eventKey={1} href="/documents">Documents</NavItem>
+      <LinkContainer to="/invoices">
+        <NavItem eventKey={1} href="/invoices">Invoices</NavItem>
+      </LinkContainer>
+      <LinkContainer to="/recipients">
+        <NavItem eventKey={1} href="/recipients">Recipients</NavItem>
       </LinkContainer>
     </Nav>
     <Nav pullRight>

diff --git a/imports/ui/components/Navigation/Navigation.js b/imports/ui/components/Navigation/Navigation.js
@@ -11,7 +11,7 @@ const Navigation = props => (
   <Navbar>
     <Navbar.Header>
       <Navbar.Brand>
-        <Link to="/">Pup</Link>
+        <Link to="/">CloudControl</Link>
       </Navbar.Brand>
       <Navbar.Toggle />
     </Navbar.Header>

diff --git a/imports/ui/components/Public/Public.js b/imports/ui/components/Public/Public.js
@@ -9,7 +9,7 @@ const Public = ({ loggingIn, authenticated, component, path, exact, ...rest }) =
     render={props => (
       !authenticated ?
         (React.createElement(component, { ...props, ...rest, loggingIn, authenticated })) :
-        (<Redirect to="/documents" />)
+        (<Redirect to="/invoices" />)
     )}
   />
 );