From 568f6e245f6088217b02aeec0e6ab011e302d2cc Mon Sep 17 00:00:00 2001
From: yamanq <ybq987@gmail.com>
Date: Fri, 12 Aug 2016 18:27:03 -0400
Subject: [PATCH] profile fixes

---
 hourglass/client/profile/profile.html |  1 -
 hourglass/client/profile/profile.js   | 26 +++++++++++++++++---------
 hourglass/server/main.js              |  8 +++++---
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/hourglass/client/profile/profile.html b/hourglass/client/profile/profile.html
index 4efef97..f9a15a7 100644
--- a/hourglass/client/profile/profile.html
+++ b/hourglass/client/profile/profile.html
@@ -1,6 +1,5 @@
 <template name="profile">
 	<div id="profPage" style="background-color:{{divColor 'header'}};height:{{mainHeight}};">
-		<div id="save"><h2>Save Settings</h2></div>
 		<div id="mainpage" onclick="window.location='/'"><h2>Main Page</h2></div>
 		<div id="profMainContainer" style="{{mainCenter}}">
 			<div id="profBanner" style="{{banner}};"></div>
diff --git a/hourglass/client/profile/profile.js b/hourglass/client/profile/profile.js
index 8a4a0f1..26bad1a 100644
--- a/hourglass/client/profile/profile.js
+++ b/hourglass/client/profile/profile.js
@@ -77,19 +77,25 @@ Template.profile.helpers({
     banner() {
         var width = window.innerWidth * 1600 / 1920;
         var height = width * 615 / 1600;
-        if (Meteor.user().profile.banner !== undefined) {
+        if (Meteor.user().profile.banner) {
             var banner = Meteor.user().profile.banner;
         } else {
-            var banner = "defaultcover.jpg";
+            var banner = "Banners/defaultcover.jpg";
+            currentprofile = Meteor.user().profile;
+            currentprofile.banner = banner
+            Meteor.call("editProfile", currentprofile);
         }
-        return "width:" + width.toString() + "px;height:" + height.toString() + "px;background-image:url(\'" + banner + "\');background-size:" + width.toString() + "px " + height.toString() + "px";
+        return "width:" + width.toString() + "px;height:" + height.toString() + "px;background-image:url(" + banner + ");background-size:" + width.toString() + "px " + height.toString() + "px";
     },
     avatar() {
         var dim = window.innerWidth * 1600 / 1920 * 0.16;
-        if (Meteor.user().profile.avatar !== undefined) {
-            var pic = "\'" + Meteor.user().profile.avatar + "\'";
+        if (Meteor.user().profile.avatar) {
+            var pic = Meteor.user().profile.avatar;
         } else {
-            var pic = "defaultAvatars/" + (Math.floor(Math.random() * (11 - 1)) + 1).toString() + ".png";
+            var pic = "Avatars/" + (Math.floor(Math.random() * (11 - 1)) + 1).toString(); + ".png";
+            currentprofile = Meteor.user().profile;
+            currentprofile.avatar = pic
+            Meteor.call("editProfile", currentprofile);
         }
         return "background-image:url(" + pic + ");background-size:" + dim.toString() + "px " + dim.toString() + "px";
     },
@@ -101,21 +107,21 @@ Template.profile.helpers({
         return Meteor.user().profile.name;
     },
     motd() {
-        if (Meteor.user().profile.description !== undefined) {
+        if (Meteor.user().profile.description) {
             return Meteor.user().profile.description;
         } else {
             return "Say something about yourself!";
         }
     },
     school() {
-        if (Meteor.user().profile.school !== undefined) {
+        if (Meteor.user().profile.school) {
             return Meteor.user().profile.school;
         } else {
             return "Click here to edit...";
         }
     },
     grade() {
-        if (Meteor.user().profile.grade !== undefined) {
+        if (Meteor.user().profile.grade) {
             return Meteor.user().profile.grade + "th";
         } else {
             return "Click here to edit...";
@@ -457,6 +463,8 @@ function closeInput(sessval) {
     }
     span.style.display = "initial";
     Session.set("modifying", null);
+    Session.set("serverData", getProfileData());
+    sendData("editProfile");
 }
 
 function sendData(funcName) {
diff --git a/hourglass/server/main.js b/hourglass/server/main.js
index 250a53f..f2c1f30 100644
--- a/hourglass/server/main.js
+++ b/hourglass/server/main.js
@@ -129,9 +129,11 @@ Meteor.methods({
                 name: current.school
             }) !== null &&
             Number.isInteger(current.grade) &&
-            current.grade >= 9 && current.grade <= 12 &&
-            current.description.length <= 50) {
-
+            current.grade >= 9 && current.grade <= 12) {
+          
+            if (current.description && current.description.length > 50) {
+              current.description = current.description.slice(0,50);
+            }
             Meteor.users.update({
                 _id: Meteor.userId()
             }, {