From 1dace8125743c92d877074129bf0589b26383a21 Mon Sep 17 00:00:00 2001
From: lizzkats <katsnelson.lizz@gmail.com>
Date: Wed, 8 Mar 2017 10:46:26 -0800
Subject: [PATCH 1/3] first commit of header seeking feedback on what to
 implement

---
 artifacts/assorted-jaeger.md                         |  4 ++--
 src/browser/components/atoms/Userimage/userImage.js  | 11 +++++++++++
 src/browser/components/atoms/Userimage/userimage.css |  4 ++++
 src/browser/components/molecules/Navbar/index.css    |  2 ++
 src/browser/components/molecules/Navbar/index.js     |  8 +++++---
 src/browser/components/pages/Dashboard/index.js      |  2 ++
 6 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 src/browser/components/atoms/Userimage/userImage.js
 create mode 100644 src/browser/components/atoms/Userimage/userimage.css

diff --git a/artifacts/assorted-jaeger.md b/artifacts/assorted-jaeger.md
index 88d5f98..8a746f2 100644
--- a/artifacts/assorted-jaeger.md
+++ b/artifacts/assorted-jaeger.md
@@ -3,8 +3,8 @@
 Working on UI and a few pieces of functionality.
 
 ## Project Specs
-- [ ] [Issue #90:](https://github.com/GuildCrafts/noob/issues/90) Tasks should be sorted according to title
-- [ ] [Issue #86:](https://github.com/GuildCrafts/noob/issues/86) Add a link to file an issue in the footer
+- [x] [Issue #90:](https://github.com/GuildCrafts/noob/issues/90) Tasks should be sorted according to title
+- [x] [Issue #86:](https://github.com/GuildCrafts/noob/issues/86) Add a link to file an issue in the footer
 - [ ] [Issue #85:](https://github.com/GuildCrafts/noob/issues/85) Add an estimated completion time to template tasks and tasks
 - [ ] [Issue #78:](https://github.com/GuildCrafts/noob/issues/78) Create a header for Newbie
 
diff --git a/src/browser/components/atoms/Userimage/userImage.js b/src/browser/components/atoms/Userimage/userImage.js
new file mode 100644
index 0000000..e2c30fc
--- /dev/null
+++ b/src/browser/components/atoms/Userimage/userImage.js
@@ -0,0 +1,11 @@
+import React, { Component } from 'react'
+import styles from './userimage.css'
+export default class UserImage extends Component{
+  render() {
+    return (
+      <div>
+      <img className='user-image' src='http://placehold.it/50x50&text=slide1' />
+      </div>
+    )
+  }
+}
diff --git a/src/browser/components/atoms/Userimage/userimage.css b/src/browser/components/atoms/Userimage/userimage.css
new file mode 100644
index 0000000..dd622f9
--- /dev/null
+++ b/src/browser/components/atoms/Userimage/userimage.css
@@ -0,0 +1,4 @@
+.user-image {
+  width: 50px;
+  height: 50px;
+}
diff --git a/src/browser/components/molecules/Navbar/index.css b/src/browser/components/molecules/Navbar/index.css
index 3b897b8..e4f639e 100644
--- a/src/browser/components/molecules/Navbar/index.css
+++ b/src/browser/components/molecules/Navbar/index.css
@@ -1,4 +1,6 @@
 .Navbar {
+    font-family: inherit;
+    font-size: 30px;
     display: flex;
     flex-direction: row;
     justify-content: space-between;
diff --git a/src/browser/components/molecules/Navbar/index.js b/src/browser/components/molecules/Navbar/index.js
index 708bca2..91e6ff0 100644
--- a/src/browser/components/molecules/Navbar/index.js
+++ b/src/browser/components/molecules/Navbar/index.js
@@ -1,10 +1,12 @@
 import React, { Component } from 'react'
 import styles from './index.css'
+ import UserImage from '../../atoms/Userimage/userimage'
 
 export default class Navbar extends Component {
   render() {
-    return (<div className={styles.Navbar}>
-              This is the navbar
-            </div>)
+    return <div className={styles.Navbar}>
+             Newbie
+             <UserImage />
+            </div>
   }
 }
diff --git a/src/browser/components/pages/Dashboard/index.js b/src/browser/components/pages/Dashboard/index.js
index 7a20708..71d7750 100644
--- a/src/browser/components/pages/Dashboard/index.js
+++ b/src/browser/components/pages/Dashboard/index.js
@@ -1,6 +1,7 @@
 import React, { Component } from 'react'
 import Layout from '../../molecules/Layout/index'
 import styles from './index.css'
+import Navbar from '../../molecules/Navbar/index'
 import GenericDashboard from '../GenericDashboard/index'
 import MentorDashboard from '../MentorDashboard/index'
 import NewbieDashboard from '../NewbieDashboard/index'
@@ -55,6 +56,7 @@ export default class Dashboard extends Component {
     console.log('state:', this.state)
     return (
         <Layout>
+        <Navbar />
           {this.chooseDashboardJSX(this.state.user)}
         </Layout>
     )

From 77f1654a7350630e89a65e63c52da75ac4612965 Mon Sep 17 00:00:00 2001
From: lizzkats <katsnelson.lizz@gmail.com>
Date: Thu, 9 Mar 2017 15:49:25 -0800
Subject: [PATCH 2/3] adds user image with gravatar url

---
 package.json                                     |  1 +
 .../components/atoms/Userimage/userImage.js      | 16 ++++++++++++++--
 src/browser/components/molecules/Navbar/index.js |  4 +++-
 src/browser/components/pages/Dashboard/index.js  |  7 ++++---
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 16cfb89..0ed7a69 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
     "json-loader": "^0.5.4",
     "knex": "^0.12.6",
     "lodash": "^4.17.4",
+    "md5": "^2.2.1",
     "mocha": "^3.2.0",
     "moment": "^2.17.1",
     "morgan": "~1.7.0",
diff --git a/src/browser/components/atoms/Userimage/userImage.js b/src/browser/components/atoms/Userimage/userImage.js
index e2c30fc..542d6b5 100644
--- a/src/browser/components/atoms/Userimage/userImage.js
+++ b/src/browser/components/atoms/Userimage/userImage.js
@@ -1,10 +1,22 @@
 import React, { Component } from 'react'
 import styles from './userimage.css'
-export default class UserImage extends Component{
+import md5 from 'md5'
+
+export default class UserImage extends Component {
+  emailHash(){
+    console.log( '----', this.props )
+
+    if(this.props.user !== undefined) {
+      return md5(this.props.user.email)
+    } else {
+      return ''
+    }
+  }
+
   render() {
     return (
       <div>
-      <img className='user-image' src='http://placehold.it/50x50&text=slide1' />
+        <img className='user-image' src={`https://gravatar.com/avatar/${this.emailHash()}`} />
       </div>
     )
   }
diff --git a/src/browser/components/molecules/Navbar/index.js b/src/browser/components/molecules/Navbar/index.js
index 91e6ff0..4ed98ba 100644
--- a/src/browser/components/molecules/Navbar/index.js
+++ b/src/browser/components/molecules/Navbar/index.js
@@ -4,9 +4,11 @@ import styles from './index.css'
 
 export default class Navbar extends Component {
   render() {
+    const {user} = this.props
+
     return <div className={styles.Navbar}>
              Newbie
-             <UserImage />
+             <UserImage user={user} />
             </div>
   }
 }
diff --git a/src/browser/components/pages/Dashboard/index.js b/src/browser/components/pages/Dashboard/index.js
index 71d7750..0830357 100644
--- a/src/browser/components/pages/Dashboard/index.js
+++ b/src/browser/components/pages/Dashboard/index.js
@@ -24,13 +24,14 @@ export default class Dashboard extends Component {
       }),
       credentials: 'same-origin'
     }
+
     fetch('/api/users/current_user', options)
       .then( response => {
         return response.json()
       })
       .then( user => {
-        this.setState({user: user})
-      });
+        this.setState({ user })
+      })
   }
 
   chooseDashboardJSX(user){
@@ -56,7 +57,7 @@ export default class Dashboard extends Component {
     console.log('state:', this.state)
     return (
         <Layout>
-        <Navbar />
+        <Navbar user={this.state.user} />
           {this.chooseDashboardJSX(this.state.user)}
         </Layout>
     )

From e3794e3d1f378bc8ebcac4a9f9f691dbe9d51386 Mon Sep 17 00:00:00 2001
From: lizzkats <katsnelson.lizz@gmail.com>
Date: Thu, 9 Mar 2017 16:04:02 -0800
Subject: [PATCH 3/3] styles based on feedback

---
 src/browser/components/atoms/Userimage/userImage.js  | 5 +----
 src/browser/components/atoms/Userimage/userimage.css | 4 ++--
 src/browser/components/molecules/Navbar/index.js     | 2 +-
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/browser/components/atoms/Userimage/userImage.js b/src/browser/components/atoms/Userimage/userImage.js
index 542d6b5..9ce7dc9 100644
--- a/src/browser/components/atoms/Userimage/userImage.js
+++ b/src/browser/components/atoms/Userimage/userImage.js
@@ -4,7 +4,6 @@ import md5 from 'md5'
 
 export default class UserImage extends Component {
   emailHash(){
-    console.log( '----', this.props )
 
     if(this.props.user !== undefined) {
       return md5(this.props.user.email)
@@ -15,9 +14,7 @@ export default class UserImage extends Component {
 
   render() {
     return (
-      <div>
-        <img className='user-image' src={`https://gravatar.com/avatar/${this.emailHash()}`} />
-      </div>
+      <img className='user-image' src={`https://gravatar.com/avatar/${this.emailHash()}`} />
     )
   }
 }
diff --git a/src/browser/components/atoms/Userimage/userimage.css b/src/browser/components/atoms/Userimage/userimage.css
index dd622f9..3eeae2e 100644
--- a/src/browser/components/atoms/Userimage/userimage.css
+++ b/src/browser/components/atoms/Userimage/userimage.css
@@ -1,4 +1,4 @@
 .user-image {
-  width: 50px;
-  height: 50px;
+    width: 50px;
+    height: 50px;
 }
diff --git a/src/browser/components/molecules/Navbar/index.js b/src/browser/components/molecules/Navbar/index.js
index 4ed98ba..23945cd 100644
--- a/src/browser/components/molecules/Navbar/index.js
+++ b/src/browser/components/molecules/Navbar/index.js
@@ -1,6 +1,6 @@
 import React, { Component } from 'react'
 import styles from './index.css'
- import UserImage from '../../atoms/Userimage/userimage'
+import UserImage from '../../atoms/Userimage/userimage'
 
 export default class Navbar extends Component {
   render() {