From 2f078dc8bf795378b52e9ba18acc72e651ec96ec Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Mon, 26 Sep 2016 18:55:18 -0400 Subject: [PATCH 1/6] remove semantic, add select2 --- hourglass/.meteor/packages | 2 +- hourglass/.meteor/versions | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/hourglass/.meteor/packages b/hourglass/.meteor/packages index 0b89015..d0281cb 100644 --- a/hourglass/.meteor/packages +++ b/hourglass/.meteor/packages @@ -37,5 +37,5 @@ houston:admin ahref:dragula harrison:papa-parse pfafman:filesaver -semantic:ui flemay:less-autoprefixer +natestrauser:select2 diff --git a/hourglass/.meteor/versions b/hourglass/.meteor/versions index fc34fea..56a917e 100644 --- a/hourglass/.meteor/versions +++ b/hourglass/.meteor/versions @@ -79,6 +79,7 @@ modules-runtime@0.7.6 momentjs:moment@2.14.4 mongo@1.1.12 mongo-id@1.0.5 +natestrauser:select2@4.0.3 npm-bcrypt@0.9.1 npm-mongo@1.5.49 oauth@1.1.11 @@ -97,8 +98,6 @@ reload@1.1.10 retry@1.0.8 routepolicy@1.0.11 rzymek:fullcalendar@2.7.2 -semantic:ui@2.2.1 -semantic:ui-data@2.2.4 service-configuration@1.0.10 session@1.1.6 sha@1.0.8 From f6b6fd53895032675007113d7ee864a9ab26329d Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Mon, 26 Sep 2016 18:58:15 -0400 Subject: [PATCH 2/6] fix user profiles not loading when logged out --- hourglass/lib/router.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hourglass/lib/router.js b/hourglass/lib/router.js index a50ae91..289271f 100644 --- a/hourglass/lib/router.js +++ b/hourglass/lib/router.js @@ -57,7 +57,7 @@ Router.route('/user/:email', { }, action: function() { if(Meteor.users.findOne({'services.google.email': this.params.email}) !== undefined) { - if(this.params.email === Meteor.user().services.google.email) { + if(Meteor.user() && this.params.email === Meteor.user().services.google.email) { this.redirect('/profile'); } else { this.render('user'); From 2a0aeaa84997eb0ca94dca17e481d473ae9d2bb1 Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Mon, 26 Sep 2016 19:05:06 -0400 Subject: [PATCH 3/6] fix bug of avatar pic not showing on non-admin --- hourglass/lib/router.js | 4 ++-- hourglass/server/main.js | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/hourglass/lib/router.js b/hourglass/lib/router.js index 289271f..cb0c938 100644 --- a/hourglass/lib/router.js +++ b/hourglass/lib/router.js @@ -61,10 +61,10 @@ Router.route('/user/:email', { this.redirect('/profile'); } else { this.render('user'); - } + } } else { this.render("NotFound"); - } + } } }); diff --git a/hourglass/server/main.js b/hourglass/server/main.js index e0e5abe..73d7882 100644 --- a/hourglass/server/main.js +++ b/hourglass/server/main.js @@ -127,6 +127,7 @@ Meteor.publish('users', function() { // Only return necessary fields fields: { 'services.google.email': 1, + 'services.google.picture': 1, 'profile.banner': 1, 'profile.grade': 1, 'profile.description': 1, From bacb13ae7cf9c9dddf2cc562fe1cfc8ff759d375 Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Mon, 26 Sep 2016 19:31:29 -0400 Subject: [PATCH 4/6] fix profile editing bugs --- hourglass/client/profile/profile.js | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/hourglass/client/profile/profile.js b/hourglass/client/profile/profile.js index b9bd82e..e1c4731 100644 --- a/hourglass/client/profile/profile.js +++ b/hourglass/client/profile/profile.js @@ -76,7 +76,8 @@ Template.profile.helpers({ return Session.get("user").name; }, motd() { // Returns the current user's description - if (Session.get("user").description !== undefined) return Session.get("user").description; + console.log(Session.get("user").description); + if (Session.get("user").description !== "") return Session.get("user").description; return "Say something about yourself!"; }, school() { // Returns the current user's school's name @@ -281,7 +282,7 @@ Template.profile.events({ Session.set("selectedClass",array); Session.set("owned",true); - }); + }); }, 'click .classBox .fa-times' (event) { // Leaves a class var box = event.target.parentNode; @@ -457,15 +458,15 @@ Template.profile.events({ try { for (var i = 0; i < document.getElementsByClassName("profOptions").length; i++) { var curr = document.getElementsByClassName("profOptions")[i]; - if (curr.childNodes[1] !== op.nextSibling.nextSibling.childNodes[1] - && curr.childNodes[1] !== op.parentNode.parentNode.childNodes[3].childNodes[1]) { + if (curr.childNodes[1] !== op.nextSibling.nextSibling.childNodes[1] && + curr.childNodes[1] !== op.parentNode.parentNode.childNodes[3].childNodes[1]) { closeDivFade(document.getElementsByClassName("profOptions")[i]); } } } catch (err) {} if(event.target.className.includes("op")) { - openDivFade(op.nextSibling.nextSibling); + openDivFade(op.nextSibling.nextSibling); } else { openDivFade(op.parentNode.parentNode.childNodes[3]); } @@ -615,11 +616,11 @@ function getProfileData() { // Gets all data related to profile. 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 = ""; + if(!profile.grade) 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(), From bba1cd1c7543905f2b49ce82527bb58897065e0d Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Tue, 27 Sep 2016 00:22:26 -0400 Subject: [PATCH 5/6] Added themes in constants, and background images, minor fixes --- hourglass/client/main/main.css | 11 ++++-- hourglass/client/main/main.html | 17 +++++---- hourglass/client/main/main.js | 4 +-- hourglass/client/profile/profile.css | 4 +-- hourglass/client/profile/profile.js | 6 ++-- hourglass/lib/constants.js | 52 ++++++++++++++++++++++++++-- 6 files changed, 72 insertions(+), 22 deletions(-) diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css index c80051b..b1d9e16 100644 --- a/hourglass/client/main/main.css +++ b/hourglass/client/main/main.css @@ -262,7 +262,7 @@ input, textarea { .mode, .function { width: 100%; position: relative; - background-color: #849CAE; + background-color: rgba(255,255,255,0.2); -webkit-transition: background-color 0.5s ease, box-shadow 0.5s ease; -moz-transition: background-color 0.5s ease, box-shadow 0.5s ease; @@ -577,6 +577,7 @@ input, textarea { } #editWork { + min-height: 68vh; margin: auto; margin-top: 5%; @@ -599,6 +600,7 @@ input, textarea { #editWorkCont { width: 100%; height: 100%; + min-height: 68vh; position: relative; display: table; @@ -1012,9 +1014,12 @@ input, textarea { background-color: rgba(255,255,255,0.1); } +.fc-past { + background-color: rgba(0,0,0,0.2); +} + .fc-day:not(.fc-past) { cursor: pointer; - box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.1); -webkit-transition: box-shadow 0.4s ease; -moz-transition: box-shadow 0.4s ease; @@ -1023,7 +1028,7 @@ input, textarea { } .fc-day:not(.fc-past):hover { - box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.15); + box-shadow: inset 0 0 0 99999px rgba(0,0,0,0.1); } .fc-slats, .fc-content-skeleton { diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html index d47fcb2..fc3e14c 100644 --- a/hourglass/client/main/main.html +++ b/hourglass/client/main/main.html @@ -12,21 +12,21 @@ -
+