From e1002b5a0dcd4c967744f86a3896fe479a0cb6cf Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Tue, 20 Sep 2016 21:10:22 -0400 Subject: [PATCH 01/16] groundwork --- hourglass/.meteor/packages | 2 ++ hourglass/.meteor/versions | 2 ++ 2 files changed, 4 insertions(+) diff --git a/hourglass/.meteor/packages b/hourglass/.meteor/packages index 1c6d907..37010b3 100644 --- a/hourglass/.meteor/packages +++ b/hourglass/.meteor/packages @@ -35,3 +35,5 @@ http@1.2.9 underscore houston:admin ahref:dragula +harrison:papa-parse +pfafman:filesaver diff --git a/hourglass/.meteor/versions b/hourglass/.meteor/versions index 84a81ab..5ea89b7 100644 --- a/hourglass/.meteor/versions +++ b/hourglass/.meteor/versions @@ -42,6 +42,7 @@ fastclick@1.0.12 fortawesome:fontawesome@4.5.0 geojson-utils@1.0.9 google@1.1.14 +harrison:papa-parse@1.1.1 hot-code-push@1.0.4 houston:admin@2.0.7 html-tools@1.0.10 @@ -84,6 +85,7 @@ oauth2@1.1.10 observe-sequence@1.0.12 ongoworks:security@2.0.1 ordered-dict@1.0.8 +pfafman:filesaver@1.3.2 promise@0.8.4 proyk:meteor-cookies@0.0.1 random@1.0.10 From 20c0ca7a9fd67680796dab29ea663485428a131f Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Thu, 22 Sep 2016 00:36:08 -0400 Subject: [PATCH 02/16] add click event for eventual export --- hourglass/client/main/main.js | 18 ++++++++++++++++++ hourglass/server/main.js | 2 +- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index 3a07e34..136f6c0 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -769,6 +769,24 @@ Template.main.events({ text.style.display = "initial"; text.style.color = "#7E7E7E"; }, + 'click #export' (event) { + events = []; + + var userClasses = Session.get("calendarClasses"); + + for (var i = 0; i < userClasses.length; i++) { + var works = userClasses[i].thisClassWork; + for (var j = 0; j < works.length; j++) { + var work = works[j]; + events.push({ + "Subject": work.name, + "Start Date": work.dueDate.toLocaleDateString(), + "Description": work.description, + "All Day Event": True + }); + } + } + }, 'keydown input' (event) { // Enter to close input. var modifyingInput = Session.get("modifying"); if (event.keyCode == 13 && modifyingInput != "workDesc") { diff --git a/hourglass/server/main.js b/hourglass/server/main.js index 7e97eeb..e0e5abe 100644 --- a/hourglass/server/main.js +++ b/hourglass/server/main.js @@ -443,7 +443,7 @@ Meteor.methods({ } }, 'deleteWork': function(workId) { - var currentwork = wokr.findOne({ + var currentwork = work.findOne({ _id: workId }); var currentclass = classes.findOne({ From 1a31a25b36bc7075056b3be8d493288167e293f4 Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Thu, 22 Sep 2016 21:17:34 -0400 Subject: [PATCH 03/16] site info => JSON --- hourglass/client/main/main.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index 136f6c0..80e1733 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -780,12 +780,13 @@ Template.main.events({ var work = works[j]; events.push({ "Subject": work.name, - "Start Date": work.dueDate.toLocaleDateString(), + "Start Date": work.realDate.toLocaleDateString(), "Description": work.description, - "All Day Event": True + "All Day Event": true }); } } + console.log(JSON.stringify(events)); }, 'keydown input' (event) { // Enter to close input. var modifyingInput = Session.get("modifying"); From e7078c622ab7f7fe72724655d875afa574ecc0fa Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Thu, 22 Sep 2016 21:21:36 -0400 Subject: [PATCH 04/16] add class name to JSON --- hourglass/client/main/main.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hourglass/client/main/main.js b/hourglass/client/main/main.js index 80e1733..f78cb87 100644 --- a/hourglass/client/main/main.js +++ b/hourglass/client/main/main.js @@ -778,8 +778,9 @@ Template.main.events({ var works = userClasses[i].thisClassWork; for (var j = 0; j < works.length; j++) { var work = works[j]; + console.log(work); events.push({ - "Subject": work.name, + "Subject": classes.findOne({_id: work.class}).name + ": " + work.name, "Start Date": work.realDate.toLocaleDateString(), "Description": work.description, "All Day Event": true From 5a9c7ec36d7e8a9a532ad7e927fe8b53b8c3bbd3 Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Fri, 23 Sep 2016 19:37:53 -0400 Subject: [PATCH 05/16] json to csv --- hourglass/client/main/main.html | 3 ++- hourglass/client/main/main.js | 25 ++++++++++++++++++------- 2 files changed, 20 insertions(+), 8 deletions(-) diff --git a/hourglass/client/main/main.html b/hourglass/client/main/main.html index 7f36012..6074b4a 100644 --- a/hourglass/client/main/main.html +++ b/hourglass/client/main/main.html @@ -7,7 +7,8 @@
-

Hourglass

{{schoolName}}

+ +

Hourglass

{{schoolName}}

{{/if}} + +
+ +

Export

+

Preferences

@@ -112,10 +117,6 @@

No

-
- -

Export

-
From 38727ecd3162772a15dd6d0538f0e1cbf998982b Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Sat, 24 Sep 2016 19:04:11 -0400 Subject: [PATCH 10/16] css fix --- hourglass/client/main/main.css | 1 + 1 file changed, 1 insertion(+) diff --git a/hourglass/client/main/main.css b/hourglass/client/main/main.css index 8741dc4..401bd48 100644 --- a/hourglass/client/main/main.css +++ b/hourglass/client/main/main.css @@ -458,6 +458,7 @@ input, textarea { .classInfo { padding: 6%; background-color: rgba(255,255,255,0.3); /* remove when class color */ + cursor: pointer; } .mainClassName { From 88e90f4f33dee84ec4250c5f580de6f55f9f376a Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Sat, 24 Sep 2016 19:10:49 -0400 Subject: [PATCH 11/16] Fixed new profile not loading new values --- hourglass/client/profile/profile.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hourglass/client/profile/profile.js b/hourglass/client/profile/profile.js index ba990ad..b9bd82e 100644 --- a/hourglass/client/profile/profile.js +++ b/hourglass/client/profile/profile.js @@ -76,15 +76,15 @@ Template.profile.helpers({ return Session.get("user").name; }, motd() { // Returns the current user's description - if (Session.get("user").description !== "") return Session.get("user").description; + if (Session.get("user").description !== undefined) return Session.get("user").description; return "Say something about yourself!"; }, school() { // Returns the current user's school's name - if (Session.get("user").school !== "") return Session.get("user").school; + if (Session.get("user").school !== undefined) return Session.get("user").school; return "Click here to edit..."; }, grade() { // Returns the current user's grade - if (Session.get("user").grade !== "") return Session.get("user").grade + "th"; + if (Session.get("user").grade !== undefined) return Session.get("user").grade + "th"; return "Click here to edit..."; }, classes() { // Loads all of the possible classes ( Limit of twenty shown ) ( Sorts by class size ) From ea64ed9c51217fc09c090cda9b4c7cf0e0520ce8 Mon Sep 17 00:00:00 2001 From: Kenneth Jao Date: Sat, 24 Sep 2016 19:48:50 -0400 Subject: [PATCH 12/16] Modified login CSS, added version number --- hourglass/client/login/login.css | 38 +++++++++++++++++++------------ hourglass/client/login/login.html | 1 + 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/hourglass/client/login/login.css b/hourglass/client/login/login.css index 9be5bbb..5ffc206 100644 --- a/hourglass/client/login/login.css +++ b/hourglass/client/login/login.css @@ -12,14 +12,14 @@ height: 4px; background-color: #33ADFF; position: absolute; - top: 13vh; + top: 11vh; z-index: 51; } #loginHeader { font-weight: 600; width: 100%; - height: 13vh; + height: 11vh; background-color: #EBEBEB; box-shadow: 2px 2px 5px 3px #666; @@ -31,10 +31,10 @@ } #logo { - height: 10vh; - width: 10vh; + height: 8vh; + width: 8vh; padding: 1.5vh; - line-height: 13vh; + line-height: 11vh; float: left; @@ -45,8 +45,8 @@ #loginTitle { font-size: 5vh; color: #000 !important; - height: 13vh; - line-height: 13vh; + height: 11vh; + line-height: 11vh; padding: 0 0 0 1vw; -webkit-filter: none; @@ -55,15 +55,15 @@ #loginMain { width: 100%; - height: 80vh; + height: 84vh; background-color: #E5E5E5; background-image: url("banner100.jpg"); - background-size: 100vw 80vh; + background-size: 100vw 84vh; display: table-row; position: absolute; - top: 13vh; + top: 11vh; } #circle { @@ -146,25 +146,33 @@ p.text { #loginFooter { width: 100%; - height: 8vh; + height: 6vh; box-shadow: 2px 2px 5px 3px #666; background-color: #EBEBEB; position: absolute; bottom: 0; } -#github { - font-size: 3vh; +#github, #version { + font-size: 2.3vh; color: #000 !important; + + height: 6vh; margin: 0; - height: 8vh; - line-height: 8vh; padding: 0 0 0 1vw; + line-height: 6vh; + display: inline-block; + -webkit-filter: drop-shadow(2px 2px 5px #444); filter: drop-shadow(2px 2px 5px #444); } +#version { + float: right; + margin-right: 1%; +} + a { color: #0099CC; text-decoration: none; diff --git a/hourglass/client/login/login.html b/hourglass/client/login/login.html index 15d4eef..6a42bfa 100644 --- a/hourglass/client/login/login.html +++ b/hourglass/client/login/login.html @@ -16,6 +16,7 @@

View the Code!

+

Version 0.2.0

{{> loginButtons}} From c7d7391bdb3e96434c6635e06b48a16d4cd3c90a Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Sat, 24 Sep 2016 20:41:39 -0400 Subject: [PATCH 13/16] background addition for visibility --- hourglass/client/login/login.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/hourglass/client/login/login.css b/hourglass/client/login/login.css index 9be5bbb..2a21458 100644 --- a/hourglass/client/login/login.css +++ b/hourglass/client/login/login.css @@ -88,6 +88,8 @@ width: 80%; margin: auto; padding-top: 16vh; + background-color: rgba(0, 0, 0, 0.2); + padding-bottom: 4vh; } .text { From daa985097b1198951678049e669a627b36a6329d Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Sun, 25 Sep 2016 11:59:36 -0400 Subject: [PATCH 14/16] do not allow main page until school is filled --- 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 8039b40..a50ae91 100644 --- a/hourglass/lib/router.js +++ b/hourglass/lib/router.js @@ -1,6 +1,6 @@ Router.route('/', { waitOn: function() { - if (!Meteor.userId()) { + if (!Meteor.userId() || !Meteor.user().profile.school) { this.redirect('/login'); } else { return [ From b41b485c0206a65fa5627adb638972de2983a989 Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Sun, 25 Sep 2016 12:00:23 -0400 Subject: [PATCH 15/16] fix version --- hourglass/client/login/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hourglass/client/login/login.html b/hourglass/client/login/login.html index 6a42bfa..5e09128 100644 --- a/hourglass/client/login/login.html +++ b/hourglass/client/login/login.html @@ -16,7 +16,7 @@

View the Code!

-

Version 0.2.0

+

Version 0.1.0

{{> loginButtons}} From 589ce7b23beab704f06e8da3297bef5046d326a9 Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Sun, 25 Sep 2016 12:04:09 -0400 Subject: [PATCH 16/16] groundwork --- hourglass/.meteor/packages | 4 +++- hourglass/.meteor/versions | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/hourglass/.meteor/packages b/hourglass/.meteor/packages index 37010b3..0b89015 100644 --- a/hourglass/.meteor/packages +++ b/hourglass/.meteor/packages @@ -9,7 +9,7 @@ mobile-experience@1.0.4 # Packages for a great mobile UX mongo@1.1.12 # The database Meteor supports right now blaze-html-templates@1.0.4 # Compile .html files into Meteor Blaze views reactive-var@1.0.10 # Reactive variable for tracker -jquery@1.11.9 # Helpful client-side library +jquery # Helpful client-side library tracker@1.1.0 # Meteor's client-side reactive programming library standard-minifier-css@1.2.0 # CSS minifier run for production mode @@ -37,3 +37,5 @@ houston:admin ahref:dragula harrison:papa-parse pfafman:filesaver +semantic:ui +flemay:less-autoprefixer diff --git a/hourglass/.meteor/versions b/hourglass/.meteor/versions index 5ea89b7..fc34fea 100644 --- a/hourglass/.meteor/versions +++ b/hourglass/.meteor/versions @@ -39,6 +39,7 @@ email@1.1.17 es5-shim@4.6.14 eternicode:bootstrap-datepicker@1.6.0_3 fastclick@1.0.12 +flemay:less-autoprefixer@1.2.0 fortawesome:fontawesome@4.5.0 geojson-utils@1.0.9 google@1.1.14 @@ -96,6 +97,8 @@ 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