favicon and title fixed

joeblas · Nov 17, 2017 · 8a4d38c · 8a4d38c
2 parents 5c6027d + 54d752e
commit 8a4d38c
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 206 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/client/main.html b/client/main.html
@@ -1,18 +1,13 @@
-<html>
-
 <head>
   <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>ControlCloud</title>
-  <meta name="description" content="Invoice Management in the Cloud">
-  <link rel="shortcut icon" type="image/png" href="/favicon.png?v1" sizes="16x16 32x32 64x64">
-  <link rel="apple-touch-icon" sizes="120x120" href="/apple-touch-icon-precomposed.png">
-  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/font-awesome/4.7.0/css/font-awesome.min.css">
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bulma/0.6.1/css/bulma.min.css">
+  <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" />
+  <link rel="shortcut icon" type="image/png" href="/favicon.png" sizes="16x16 32x32 64x64">
+  <link rel="apple-touch-icon" sizes="120x120" href="/favicon.png">
 </head>
 
 <body>
   <div id="react-root"></div>
 </body>
-
-</html>
diff --git a/imports/startup/server/api.js b/imports/startup/server/api.js
@@ -1,6 +1,6 @@
 
-import '../../api/Documents/methods';
-import '../../api/Documents/server/publications';
+// import '../../api/Documents/methods';
+// import '../../api/Documents/server/publications';
 
 import '../../api/Invoices/methods';
 import '../../api/Invoices/server/publications';

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/Content/Content.js b/imports/ui/components/Content/Content.js
diff --git a/imports/ui/components/Content/Content.scss b/imports/ui/components/Content/Content.scss
diff --git a/imports/ui/components/Footer/Footer.js b/imports/ui/components/Footer/Footer.js
@@ -13,7 +13,7 @@ const copyrightYear = () => {
 const Footer = () => (
   <div className="Footer">
     <Grid>
-      <p className="pull-left">&copy; {copyrightYear()} ControlCloud</p>
+      <p className="pull-left">&copy; {copyrightYear()} CloudControl, LLC</p>
       <ul className="pull-right">
         <li><Link to="/terms">Terms<span className="hidden-xs"> of Service</span></Link></li>
         <li><Link to="/privacy">Privacy<span className="hidden-xs"> Policy</span></Link></li>

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" />)
     )}
   />
 );

diff --git a/imports/ui/pages/Documents/Documents.js b/imports/ui/pages/Documents/Documents.js
diff --git a/imports/ui/pages/Documents/Documents.scss b/imports/ui/pages/Documents/Documents.scss
diff --git a/imports/ui/pages/EditDocument/EditDocument.js b/imports/ui/pages/EditDocument/EditDocument.js
diff --git a/imports/ui/pages/NewDocument/NewDocument.js b/imports/ui/pages/NewDocument/NewDocument.js
diff --git a/imports/ui/pages/Page/Page.js b/imports/ui/pages/Page/Page.js
@@ -4,7 +4,6 @@ import { Meteor } from 'meteor/meteor';
 import { createContainer } from 'meteor/react-meteor-data';
 import { ReactiveVar } from 'meteor/reactive-var';
 import PageHeader from '../../components/PageHeader/PageHeader';
-import Content from '../../components/Content/Content';
 
 import './Page.scss';
 

diff --git a/imports/ui/pages/Privacy/Privacy.js b/imports/ui/pages/Privacy/Privacy.js
@@ -5,7 +5,7 @@ const Privacy = () => (
   <div className="Privacy">
     <Page
       title="Privacy Policy"
-      subtitle="Last updated May 29th, 2017"
+      subtitle="Last updated November 16, 2017"
       page="privacy"
     />
   </div>

diff --git a/imports/ui/pages/Terms/Terms.js b/imports/ui/pages/Terms/Terms.js
@@ -5,7 +5,7 @@ const Terms = () => (
   <div className="Terms">
     <Page
       title="Terms of Service"
-      subtitle="Last updated May 29th, 2017"
+      subtitle="Last updated November 16, 2017"
       page="terms"
     />
   </div>

diff --git a/public/favicon.png b/public/favicon.png