From 8d46da7f28ce743d67a7eb966ed9ac17f7bd10bb Mon Sep 17 00:00:00 2001
From: Kenneth Jao <ksjdragon@gmail.com>
Date: Sun, 11 Sep 2016 18:10:00 -0400
Subject: [PATCH] Fixed profile saving default values to profile

---
 hourglass/client/main/main.css      |  3 +--
 hourglass/client/profile/profile.js | 20 ++++++++++++++------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css
index 0e4b8fc..f819702 100644
--- a/hourglass/client/main/main.css
+++ b/hourglass/client/main/main.css
@@ -1071,10 +1071,9 @@ input, textarea {
 	border-radius: 50%;
 }
 
-
 .doneUser span {
 	margin-bottom: 0.3vw;
-	
+
 	display: inline-block;
 	vertical-align: middle;
 	line-height: normal;
diff --git a/hourglass/client/profile/profile.js b/hourglass/client/profile/profile.js
index 8fbc70c..ed9f5ab 100644
--- a/hourglass/client/profile/profile.js
+++ b/hourglass/client/profile/profile.js
@@ -70,22 +70,22 @@ Template.profile.helpers({
         return Session.get("user").name;
     },
     motd() { // Returns the current user's description
-        if (Meteor.user().profile.description) {
-            return Meteor.user().profile.description;
+        if (Session.get("user").description === "") {
+            return Session.get("user").description;
         } else {
             return "Say something about yourself!";
         }
     },
     school() { // Returns the current user's school's name
-        if (Meteor.user().profile.school) {
-            return Meteor.user().profile.school;
+        if (Session.get("user").school === "") {
+            return Session.get("user").school;
         } else {
             return "Click here to edit...";
         }
     },
     grade() { // Returns the current user's grade
-        if (Meteor.user().profile.grade) {
-            return Meteor.user().profile.grade + "th";
+        if (Session.get("user").grade === "") {
+            return Session.get("user").grade + "th";
         } else {
             return "Click here to edit...";
         }
@@ -601,12 +601,20 @@ function sendData(funcName) {
 
 function getProfileData() { // Gets all data related to profile.
     var profile = Session.get("user");
+
     profile.description = document.getElementById("motd").childNodes[0].nodeValue;
+    if(profile.description.includes("Say something about yourself!")) profile.description = "";
+
     profile.school = document.getElementById("school").childNodes[0].nodeValue;
+    if(profile.school.includes("Click here to edit...")) school = "";
+
     var gradein = document.getElementById("grade").childNodes[0].nodeValue;
     profile.grade = parseInt(gradein.substring(gradein.length - 2, gradein));
+    if(profile.grade.includes("Click here to edit...")) profile.grade = "";
+
     profile.avatar = document.getElementById("profAvatar").src;
     profile.banner = document.getElementById("profBanner").src;
+    
     profile.preferences = {
         "theme":document.getElementById("prefTheme").childNodes[0].nodeValue.toLowerCase(),
         "mode":document.getElementById("prefMode").childNodes[0].nodeValue.toLowerCase(),