added navigation logo, still needs responsiveness at low width

Author: amituuush

.gitignore

@@ -1,3 +1,4 @@
 ui
 node_modules
 .DS_Store
+screenshots

client/components/App/App.jsx

@@ -372,11 +372,16 @@ var App = React.createClass({
                 notificationState={this.props.notificationState} />
 
                 <nav className="main-nav">
-                    <ul role="nav">
-                        <Link to="/" onlyActiveOnIndex={true} className='router-link'><li>Dashboard</li></Link>
-                        <Link to="/account" className='router-link'><li>Account</li></Link>
-                        <Link to="/" className='router-link' onClick={this._handleUsernameRemove}><li>Log Out</li></Link>
-                    </ul>
+                    <div className="nav-logo">
+                        <img src="/img/gomocha-logo-lg.png" />
+                    </div>
+                    <div className="nav-links">
+                        <ul role="nav">
+                            <Link to="/" onlyActiveOnIndex={true} className='router-link'><li>Dashboard</li></Link>
+
+                            <Link to="/" className='router-link' onClick={this._handleUsernameRemove}><li>Log Out</li></Link>
+                        </ul>
+                    </div>
                 </nav>
                 {!this.state.username ?
                     <UsernameView handleUsername={this._handleUsername} /> :

client/components/App/app.scss

@@ -5,6 +5,20 @@ nav.main-nav{
     padding: 1em 0 1em 0;
 }
 
+div.nav-logo {
+    position: absolute;
+    left: 2em;
+    top: 0.5em;
+}
+
+div.nav-logo img {
+    width: 11em;
+}
+
+div.nav-links {
+}
+
+
 nav.main-nav ul{
     width: 80%;
     margin: 0 auto;
@@ -71,3 +85,14 @@ nav.main-nav ul li {
         color: #fff;
     }
 }
+
+@media only screen and (max-width: 635px) {
+    div.nav-logo {
+        top: 1.5em;
+        left: 1em;
+
+        img {
+            width: 6em;
+        }
+    }
+}

client/components/UsernameView/UsernameView/UserNameView.jsx

@@ -15,7 +15,7 @@ var UsernameView = React.createClass({
         return (
             <div>
                 <div className="title-cover-landing">
-                    <h1>The fastest way to your morning coffee.</h1>
+                    <h1>The fastest way to your morning coffeee.</h1>
                         <form onSubmit={this._handleUsernameSubmit}>
                             <input
                                 type="text"

client/index.es6

@@ -15,12 +15,13 @@ ReactDOM.render(
 )
 
 
-
+// 0. have a conditional that checks if userLocation is taken, and promps user if not. ex: Justin's phone stuck in loop because didn't have userLocation
 // 1. payment info section can be fancier
 // 2. make add to order button more noticeable, maybe a small notification
 // 4. be able to start order from previous and favorites pages. replace items in state with items in prev/fav order
 // 4.5 add date to each order
 // 5. add item deleted notification
+// 6. add GoMocha logo
 
 // implement propTypes to components
 // make calls for time it will take to walk/bike/drive at same time you call getDetails