kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed profile saving default values to profile

Browse Source
This commit is contained in:
Kenneth Jao 2016-09-11 18:10:00 -04:00
parent fba2b847b1
commit 8d46da7f28
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hourglass/client/main/main.css
View File

@ -1071,7 +1071,6 @@ input, textarea {
border-radius: 50%; border-radius: 50%;
} }
.doneUser span { .doneUser span {
margin-bottom: 0.3vw; margin-bottom: 0.3vw;

20
hourglass/client/profile/profile.js
View File

@ -70,22 +70,22 @@ Template.profile.helpers({
return Session.get("user").name; return Session.get("user").name;
}, },
motd() { // Returns the current user's description motd() { // Returns the current user's description
if (Meteor.user().profile.description) { if (Session.get("user").description === "") {
return Meteor.user().profile.description; return Session.get("user").description;
} else { } else {
return "Say something about yourself!"; return "Say something about yourself!";
} }
}, },
school() { // Returns the current user's school's name school() { // Returns the current user's school's name
if (Meteor.user().profile.school) { if (Session.get("user").school === "") {
return Meteor.user().profile.school; return Session.get("user").school;
} else { } else {
return "Click here to edit..."; return "Click here to edit...";
} }
}, },
grade() { // Returns the current user's grade grade() { // Returns the current user's grade
if (Meteor.user().profile.grade) { if (Session.get("user").grade === "") {
return Meteor.user().profile.grade + "th"; return Session.get("user").grade + "th";
} else { } else {
return "Click here to edit..."; return "Click here to edit...";
} }
@ -601,12 +601,20 @@ function sendData(funcName) {
function getProfileData() { // Gets all data related to profile. function getProfileData() { // Gets all data related to profile.
var profile = Session.get("user"); var profile = Session.get("user");
profile.description = document.getElementById("motd").childNodes[0].nodeValue; 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; 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; var gradein = document.getElementById("grade").childNodes[0].nodeValue;
profile.grade = parseInt(gradein.substring(gradein.length - 2, gradein)); 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.avatar = document.getElementById("profAvatar").src;
profile.banner = document.getElementById("profBanner").src; profile.banner = document.getElementById("profBanner").src;
profile.preferences = { profile.preferences = {
"theme":document.getElementById("prefTheme").childNodes[0].nodeValue.toLowerCase(), "theme":document.getElementById("prefTheme").childNodes[0].nodeValue.toLowerCase(),
"mode":document.getElementById("prefMode").childNodes[0].nodeValue.toLowerCase(), "mode":document.getElementById("prefMode").childNodes[0].nodeValue.toLowerCase(),