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

profile fixes

Browse Source
This commit is contained in:
yamanq 2016-08-12 18:27:03 -04:00
parent f6476182e0
commit 568f6e245f
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
hourglass/client/profile/profile.html
View File

@ -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>

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

@ -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) {

8
hourglass/server/main.js
View File

@ -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()
}, {