From 78ce5ebf210db1c3a9ef3f61ecee04137a7632bd Mon Sep 17 00:00:00 2001
From: Patrick Levy <levyp@onid.oregonstate.edu>
Date: Wed, 1 Apr 2015 09:19:39 -0500
Subject: [PATCH 1/5] small change to readme file

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 76763b8..527aabf 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-FEATURES
+INCLUDED FEATURES
 -------
 * √ - Teacher logs in and creates a "chatter" topic.
 * √ - Teacher distributes a short code for the "chatter" topic to students.

From e9c092c88b3a9ea5095323816ed28f2bcd2bdd0a Mon Sep 17 00:00:00 2001
From: Patrick Levy <levyp@onid.oregonstate.edu>
Date: Wed, 8 Apr 2015 18:51:28 -0500
Subject: [PATCH 2/5] Bug fix for missing username in home view

---
 packages/login/client/templates.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/login/client/templates.html b/packages/login/client/templates.html
index 46f4388..de84963 100644
--- a/packages/login/client/templates.html
+++ b/packages/login/client/templates.html
@@ -36,8 +36,8 @@
 			</div>
 		</form>
 		{{else}}
-			<h3 style="font-weight: 300;">Hello, {{userName}}.</h3>
-			<a href="{{pathFor 'signOut'}}">Not {{userName}}? Sign out.</a>
+			<h3 style="font-weight: 300;">Hello, {{currentUser.profile.name}}.</h3>
+			<a href="{{pathFor 'signOut'}}">Not {{currentUser.profile.name}}? Sign out.</a>
 			<div style="margin: 2em 0;">
 				<a href="{{pathFor 'chatters.index'}}" class="btn btn-success">Jump to Chatter Topics</a>
 			</div>

From 3c24eab2637d4744fe8ec52fbfe8a03db38801ec Mon Sep 17 00:00:00 2001
From: Patrick Levy <levyp@onid.oregonstate.edu>
Date: Thu, 9 Apr 2015 20:30:57 -0500
Subject: [PATCH 3/5] bug fix - incorrect profile name display

---
 client/views/dashboard/dashboard.html | 2 +-
 packages/login/client/templates.html  | 4 ++--
 packages/utils/utils.js               | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/client/views/dashboard/dashboard.html b/client/views/dashboard/dashboard.html
index a393f47..42196c5 100644
--- a/client/views/dashboard/dashboard.html
+++ b/client/views/dashboard/dashboard.html
@@ -1,6 +1,6 @@
 <template name="Dashboard">
 	<h2>
-		Welcome, {{currentUser.profile.name}}
+		Welcome, {{userName}}
 		<a href="{{pathFor 'signOut'}}" class="btn btn-link">Sign out</a>
 	</h2>
 	
diff --git a/packages/login/client/templates.html b/packages/login/client/templates.html
index de84963..46f4388 100644
--- a/packages/login/client/templates.html
+++ b/packages/login/client/templates.html
@@ -36,8 +36,8 @@
 			</div>
 		</form>
 		{{else}}
-			<h3 style="font-weight: 300;">Hello, {{currentUser.profile.name}}.</h3>
-			<a href="{{pathFor 'signOut'}}">Not {{currentUser.profile.name}}? Sign out.</a>
+			<h3 style="font-weight: 300;">Hello, {{userName}}.</h3>
+			<a href="{{pathFor 'signOut'}}">Not {{userName}}? Sign out.</a>
 			<div style="margin: 2em 0;">
 				<a href="{{pathFor 'chatters.index'}}" class="btn btn-success">Jump to Chatter Topics</a>
 			</div>
diff --git a/packages/utils/utils.js b/packages/utils/utils.js
index fcb9950..c61254e 100644
--- a/packages/utils/utils.js
+++ b/packages/utils/utils.js
@@ -122,10 +122,15 @@ Utils = {
 	}
 	, objects: {
 		userName: function (userId) {
-			var user = Meteor.users.findOne(userId)
+			var user = Meteor.users.findOne(Meteor.userId)
 				, name;
+				//console.log(user);
+				console.log("The userID was found");
 			if (user) {
 				name = user.profile.name || user.username;
+				console.log("Meteor.userId = " + Meteor.userId);
+				console.log("user.profile.name = " + user.profile.name);
+				console.log("user.username = " + user.username);
 			} else {
 				name = "Unknown User";
 			}

From 14170fb86bbf52df0fe07f780d0f213531f3c283 Mon Sep 17 00:00:00 2001
From: Patrick Levy <levyp@onid.oregonstate.edu>
Date: Thu, 9 Apr 2015 20:35:23 -0500
Subject: [PATCH 4/5] bug fix attempt 2 - incorrect profile name display in
 home view

---
 packages/utils/utils.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/packages/utils/utils.js b/packages/utils/utils.js
index c61254e..94816ad 100644
--- a/packages/utils/utils.js
+++ b/packages/utils/utils.js
@@ -124,13 +124,8 @@ Utils = {
 		userName: function (userId) {
 			var user = Meteor.users.findOne(Meteor.userId)
 				, name;
-				//console.log(user);
-				console.log("The userID was found");
 			if (user) {
 				name = user.profile.name || user.username;
-				console.log("Meteor.userId = " + Meteor.userId);
-				console.log("user.profile.name = " + user.profile.name);
-				console.log("user.username = " + user.username);
 			} else {
 				name = "Unknown User";
 			}

From 067db6f83c207beca7b5302c642561a58b7ef3ae Mon Sep 17 00:00:00 2001
From: Patrick Levy <levyp@onid.oregonstate.edu>
Date: Sun, 12 Apr 2015 21:04:32 -0500
Subject: [PATCH 5/5] used spacebars syntax to locate current user's profile

---
 client/views/dashboard/dashboard.html | 6 ++++--
 packages/login/client/templates.html  | 6 ++++--
 packages/utils/utils.js               | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/client/views/dashboard/dashboard.html b/client/views/dashboard/dashboard.html
index 42196c5..ed2a4c7 100644
--- a/client/views/dashboard/dashboard.html
+++ b/client/views/dashboard/dashboard.html
@@ -1,9 +1,11 @@
 <template name="Dashboard">
+	{{#with currentUser}}
 	<h2>
-		Welcome, {{userName}}
+		Welcome, {{userName _id}}
 		<a href="{{pathFor 'signOut'}}" class="btn btn-link">Sign out</a>
 	</h2>
-	
+	{{/with}}
+
 	{{#with accountStatus}}
 		<div class="alert alert-warning">Your current account status: <span class="{{styleClass}}">{{label}}</span></div>
 	{{/with}}
diff --git a/packages/login/client/templates.html b/packages/login/client/templates.html
index 46f4388..41b3661 100644
--- a/packages/login/client/templates.html
+++ b/packages/login/client/templates.html
@@ -36,11 +36,13 @@
 			</div>
 		</form>
 		{{else}}
-			<h3 style="font-weight: 300;">Hello, {{userName}}.</h3>
-			<a href="{{pathFor 'signOut'}}">Not {{userName}}? Sign out.</a>
+		{{#with currentUser}}
+			<h3 style="font-weight: 300;">Hello, {{userName _id}}.</h3>
+			<a href="{{pathFor 'signOut'}}">Not {{userName _id}}? Sign out.</a>
 			<div style="margin: 2em 0;">
 				<a href="{{pathFor 'chatters.index'}}" class="btn btn-success">Jump to Chatter Topics</a>
 			</div>
+		{{/with}}
 		{{/unless}}
 	</div>
 </template>
diff --git a/packages/utils/utils.js b/packages/utils/utils.js
index 94816ad..fcb9950 100644
--- a/packages/utils/utils.js
+++ b/packages/utils/utils.js
@@ -122,7 +122,7 @@ Utils = {
 	}
 	, objects: {
 		userName: function (userId) {
-			var user = Meteor.users.findOne(Meteor.userId)
+			var user = Meteor.users.findOne(userId)
 				, name;
 			if (user) {
 				name = user.profile.name || user.username;