From ce9f9da8b7856f7362cd8581f60625f912bf0762 Mon Sep 17 00:00:00 2001 From: yamanq Date: Sat, 6 Feb 2016 15:21:25 -0500 Subject: [PATCH 01/44] initial --- scheduleac/.meteor/.finished-upgraders | 12 ++++ scheduleac/.meteor/.gitignore | 1 + scheduleac/.meteor/.id | 7 +++ scheduleac/.meteor/packages | 24 ++++++++ scheduleac/.meteor/platforms | 2 + scheduleac/.meteor/release | 1 + scheduleac/.meteor/versions | 81 ++++++++++++++++++++++++++ scheduleac/client/client.css | 5 ++ scheduleac/client/client.html | 22 +++++++ scheduleac/client/client.js | 34 +++++++++++ scheduleac/collections/schedule.js | 1 + scheduleac/server/serve.js | 26 +++++++++ 12 files changed, 216 insertions(+) create mode 100644 scheduleac/.meteor/.finished-upgraders create mode 100644 scheduleac/.meteor/.gitignore create mode 100644 scheduleac/.meteor/.id create mode 100644 scheduleac/.meteor/packages create mode 100644 scheduleac/.meteor/platforms create mode 100644 scheduleac/.meteor/release create mode 100644 scheduleac/.meteor/versions create mode 100644 scheduleac/client/client.css create mode 100644 scheduleac/client/client.html create mode 100644 scheduleac/client/client.js create mode 100644 scheduleac/collections/schedule.js create mode 100644 scheduleac/server/serve.js diff --git a/scheduleac/.meteor/.finished-upgraders b/scheduleac/.meteor/.finished-upgraders new file mode 100644 index 0000000..61ee313 --- /dev/null +++ b/scheduleac/.meteor/.finished-upgraders @@ -0,0 +1,12 @@ +# This file contains information which helps Meteor properly upgrade your +# app when you run 'meteor update'. You should check it into version control +# with your project. + +notices-for-0.9.0 +notices-for-0.9.1 +0.9.4-platform-file +notices-for-facebook-graph-api-2 +1.2.0-standard-minifiers-package +1.2.0-meteor-platform-split +1.2.0-cordova-changes +1.2.0-breaking-changes diff --git a/scheduleac/.meteor/.gitignore b/scheduleac/.meteor/.gitignore new file mode 100644 index 0000000..4083037 --- /dev/null +++ b/scheduleac/.meteor/.gitignore @@ -0,0 +1 @@ +local diff --git a/scheduleac/.meteor/.id b/scheduleac/.meteor/.id new file mode 100644 index 0000000..9b73a81 --- /dev/null +++ b/scheduleac/.meteor/.id @@ -0,0 +1,7 @@ +# This file contains a token that is unique to your project. +# Check it into your repository along with the rest of this directory. +# It can be used for purposes such as: +# - ensuring you don't accidentally deploy one app on top of another +# - providing package authors with aggregated statistics + +19rhzs13b9azhvowgeq diff --git a/scheduleac/.meteor/packages b/scheduleac/.meteor/packages new file mode 100644 index 0000000..dbeddf0 --- /dev/null +++ b/scheduleac/.meteor/packages @@ -0,0 +1,24 @@ +# Meteor packages used by this project, one per line. +# Check this file (and the other files in this directory) into your repository. +# +# 'meteor add' and 'meteor remove' will edit this file for you, +# but you can also edit it by hand. + +meteor-base # Packages every Meteor app needs to have +mobile-experience # Packages for a great mobile UX +mongo # The database Meteor supports right now +blaze-html-templates # Compile .html files into Meteor Blaze views +session # Client-side reactive dictionary for your app +jquery # Helpful client-side library +tracker # Meteor's client-side reactive programming library + +standard-minifiers # JS/CSS minifiers run for production mode +es5-shim # ECMAScript 5 compatibility for older browsers. +ecmascript # Enable ECMAScript2015+ syntax in app code + +autopublish # Publish all data to the clients (for prototyping) +insecure # Allow all DB writes from clients (for prototyping) +rajit:bootstrap3-datepicker +twbs:bootstrap +accounts-google +accounts-ui diff --git a/scheduleac/.meteor/platforms b/scheduleac/.meteor/platforms new file mode 100644 index 0000000..efeba1b --- /dev/null +++ b/scheduleac/.meteor/platforms @@ -0,0 +1,2 @@ +server +browser diff --git a/scheduleac/.meteor/release b/scheduleac/.meteor/release new file mode 100644 index 0000000..3a05e0a --- /dev/null +++ b/scheduleac/.meteor/release @@ -0,0 +1 @@ +METEOR@1.2.1 diff --git a/scheduleac/.meteor/versions b/scheduleac/.meteor/versions new file mode 100644 index 0000000..69ede1b --- /dev/null +++ b/scheduleac/.meteor/versions @@ -0,0 +1,81 @@ +accounts-base@1.2.2 +accounts-google@1.0.6 +accounts-oauth@1.1.8 +accounts-ui@1.1.6 +accounts-ui-unstyled@1.1.8 +autopublish@1.0.4 +autoupdate@1.2.4 +babel-compiler@5.8.24_1 +babel-runtime@0.1.4 +base64@1.0.4 +binary-heap@1.0.4 +blaze@2.1.3 +blaze-html-templates@1.0.1 +blaze-tools@1.0.4 +boilerplate-generator@1.0.4 +caching-compiler@1.0.0 +caching-html-compiler@1.0.2 +callback-hook@1.0.4 +check@1.1.0 +ddp@1.2.2 +ddp-client@1.2.1 +ddp-common@1.2.2 +ddp-rate-limiter@1.0.0 +ddp-server@1.2.2 +deps@1.0.9 +diff-sequence@1.0.1 +ecmascript@0.1.6 +ecmascript-runtime@0.2.6 +ejson@1.0.7 +es5-shim@4.1.14 +fastclick@1.0.7 +geojson-utils@1.0.4 +google@1.1.7 +hot-code-push@1.0.0 +html-tools@1.0.5 +htmljs@1.0.5 +http@1.1.1 +id-map@1.0.4 +insecure@1.0.4 +jquery@1.11.4 +launch-screen@1.0.4 +less@2.5.1 +livedata@1.0.15 +localstorage@1.0.5 +logging@1.0.8 +meteor@1.1.10 +meteor-base@1.0.1 +minifiers@1.1.7 +minimongo@1.0.10 +mobile-experience@1.0.1 +mobile-status-bar@1.0.6 +mongo@1.1.3 +mongo-id@1.0.1 +npm-mongo@1.4.39_1 +oauth@1.1.6 +oauth2@1.1.5 +observe-sequence@1.0.7 +ordered-dict@1.0.4 +promise@0.5.1 +rajit:bootstrap3-datepicker@1.5.0 +random@1.0.5 +rate-limit@1.0.0 +reactive-dict@1.1.3 +reactive-var@1.0.6 +reload@1.1.4 +retry@1.0.4 +routepolicy@1.0.6 +service-configuration@1.0.5 +session@1.1.1 +spacebars@1.0.7 +spacebars-compiler@1.0.7 +standard-minifiers@1.0.2 +templating@1.1.5 +templating-tools@1.0.0 +tracker@1.0.9 +twbs:bootstrap@3.3.6 +ui@1.0.8 +underscore@1.0.4 +url@1.0.5 +webapp@1.2.3 +webapp-hashing@1.0.5 diff --git a/scheduleac/client/client.css b/scheduleac/client/client.css new file mode 100644 index 0000000..7481a79 --- /dev/null +++ b/scheduleac/client/client.css @@ -0,0 +1,5 @@ + +#date { + max-width: 40%; + margin-left: 5%; +} \ No newline at end of file diff --git a/scheduleac/client/client.html b/scheduleac/client/client.html new file mode 100644 index 0000000..b7d1029 --- /dev/null +++ b/scheduleac/client/client.html @@ -0,0 +1,22 @@ + + scheduleac + + + +

Welcome to Meteor!

+ {{> loginButtons}} + {{> client}} + + + + + diff --git a/scheduleac/client/client.js b/scheduleac/client/client.js new file mode 100644 index 0000000..aade5e9 --- /dev/null +++ b/scheduleac/client/client.js @@ -0,0 +1,34 @@ +Meteor.subscribe('schedule'); + +Template.client.rendered=function() { + today = new Date() + $('#date').datepicker({ + startDate: today.toLocaleDateString(), + orientation: "top auto", + daysOfWeekDisabled: "0,6", + autoclose: true, + todayHighlight: true + }); +} + + + + +Template.client.helpers({ + + + status_class: function() { + return statusmap[this.status]; + } + + +}) + +Template.client.events({ + "click button": function() { + pre = document.getElementById("date").value; + document.getElementById("date").value = ""; + post = document.getElementById('post').value; + Meteor.call('add_button', this, pre, post); + } +}) \ No newline at end of file diff --git a/scheduleac/collections/schedule.js b/scheduleac/collections/schedule.js new file mode 100644 index 0000000..f3ead9b --- /dev/null +++ b/scheduleac/collections/schedule.js @@ -0,0 +1 @@ +schedule = new Mongo.Collection("schedule"); \ No newline at end of file diff --git a/scheduleac/server/serve.js b/scheduleac/server/serve.js new file mode 100644 index 0000000..3885bdc --- /dev/null +++ b/scheduleac/server/serve.js @@ -0,0 +1,26 @@ +var currentpass = "test"; +var allowed = {}; +allowed["ybq987@gmail.com"] = true; +allowed["dweinger@bloomfield.org"] = true; + + +// schedule.permit(['insert', 'update', 'remove']).never().apply(); + +Meteor.methods({ + + add_button: function(chrome, pre, post) { + if (Meteor.user().services.google.email in allowed) { + + madate = pre.split("/"); + date = new Date(); + date.setMonth(madate[0]); + date.setDate(madate[1]); + date.setFullYear(madate[2]); + + schedule.insert({ + "pretext": date.toDateString().slice(0,date.length), + "aftertext": post + }); + } + } +}) \ No newline at end of file From 942b1b191114f930cc88c19ea66592d0700ec39a Mon Sep 17 00:00:00 2001 From: yamanq Date: Sun, 7 Feb 2016 01:46:01 -0500 Subject: [PATCH 02/44] server issues, collection management, security issues --- scheduleac/.meteor/packages | 2 ++ scheduleac/.meteor/versions | 2 ++ scheduleac/client/client.html | 16 +++++++------ scheduleac/client/client.js | 42 ++++++++++++++++++++++++----------- scheduleac/server/serve.js | 25 +++++++++++++++++---- 5 files changed, 63 insertions(+), 24 deletions(-) diff --git a/scheduleac/.meteor/packages b/scheduleac/.meteor/packages index dbeddf0..6cf83d9 100644 --- a/scheduleac/.meteor/packages +++ b/scheduleac/.meteor/packages @@ -22,3 +22,5 @@ rajit:bootstrap3-datepicker twbs:bootstrap accounts-google accounts-ui +ongoworks:security +percolate:synced-cron diff --git a/scheduleac/.meteor/versions b/scheduleac/.meteor/versions index 69ede1b..94c6954 100644 --- a/scheduleac/.meteor/versions +++ b/scheduleac/.meteor/versions @@ -55,7 +55,9 @@ npm-mongo@1.4.39_1 oauth@1.1.6 oauth2@1.1.5 observe-sequence@1.0.7 +ongoworks:security@1.3.0 ordered-dict@1.0.4 +percolate:synced-cron@1.3.0 promise@0.5.1 rajit:bootstrap3-datepicker@1.5.0 random@1.0.5 diff --git a/scheduleac/client/client.html b/scheduleac/client/client.html index b7d1029..25735c3 100644 --- a/scheduleac/client/client.html +++ b/scheduleac/client/client.html @@ -11,12 +11,14 @@ diff --git a/scheduleac/client/client.js b/scheduleac/client/client.js index aade5e9..2023b9a 100644 --- a/scheduleac/client/client.js +++ b/scheduleac/client/client.js @@ -1,30 +1,46 @@ +var allowedu = {}; +allowedu["ybq987@gmail.com"] = true; +allowedu["dweinger@bloomfield.org"] = true; + +var done = false; + Meteor.subscribe('schedule'); Template.client.rendered=function() { - today = new Date() - $('#date').datepicker({ - startDate: today.toLocaleDateString(), - orientation: "top auto", - daysOfWeekDisabled: "0,6", - autoclose: true, - todayHighlight: true - }); + } - +// schedule.find({}, {sort: {timestamp: 1}, limit: 2}).fetch() Template.client.helpers({ - - status_class: function() { - return statusmap[this.status]; - } + allowed: function() { + if (!(Meteor.user() === undefined) && Meteor.user().services.google.email in allowedu) { + return true + } else { + return false; + } + } }) Template.client.events({ + "focus input": function() { + if (!done) { + today = new Date() + $('#date').datepicker({ + startDate: today.toLocaleDateString(), + orientation: "top auto", + daysOfWeekDisabled: "0,6", + autoclose: true, + todayHighlight: true + }); + done = true; + } + }, + "click button": function() { pre = document.getElementById("date").value; document.getElementById("date").value = ""; diff --git a/scheduleac/server/serve.js b/scheduleac/server/serve.js index 3885bdc..a90d266 100644 --- a/scheduleac/server/serve.js +++ b/scheduleac/server/serve.js @@ -1,15 +1,31 @@ -var currentpass = "test"; var allowed = {}; allowed["ybq987@gmail.com"] = true; allowed["dweinger@bloomfield.org"] = true; -// schedule.permit(['insert', 'update', 'remove']).never().apply(); +schedule.remove({}) +schedule.permit(['insert', 'update', 'remove']).never().apply(); + +SyncedCron.add({ + name: 'Remove Entries past today', + schedule: function(parser) { + return parser.recur().on('00:00:00').time(); + }, + job: function() { + var today = new Date(); + + // Remove matchng Documents + schedule.remove({timestamp: {$lt: today}}); + } +}); + +SyncedCron.start(); + Meteor.methods({ add_button: function(chrome, pre, post) { - if (Meteor.user().services.google.email in allowed) { + if (Meteor.user() != undefined && Meteor.user().services.google.email in allowed) { madate = pre.split("/"); date = new Date(); @@ -19,7 +35,8 @@ Meteor.methods({ schedule.insert({ "pretext": date.toDateString().slice(0,date.length), - "aftertext": post + "aftertext": post, + "timestamp": date }); } } From dbc766a7543c735aac45c421ff138267049d1241 Mon Sep 17 00:00:00 2001 From: yamanq Date: Sun, 7 Feb 2016 02:03:06 -0500 Subject: [PATCH 03/44] displays schedule --- scheduleac/client/client.html | 26 ++++++++++++++++++++++--- scheduleac/client/client.js | 36 +++++++++++++++++++++++++++-------- 2 files changed, 51 insertions(+), 11 deletions(-) diff --git a/scheduleac/client/client.html b/scheduleac/client/client.html index 25735c3..e7c3429 100644 --- a/scheduleac/client/client.html +++ b/scheduleac/client/client.html @@ -9,10 +9,30 @@ + + + + + \ No newline at end of file diff --git a/scheduleac/client/client.js b/scheduleac/client/client.js index 2023b9a..0a1736b 100644 --- a/scheduleac/client/client.js +++ b/scheduleac/client/client.js @@ -6,15 +6,17 @@ var done = false; Meteor.subscribe('schedule'); -Template.client.rendered=function() { - -} - - -// schedule.find({}, {sort: {timestamp: 1}, limit: 2}).fetch() Template.client.helpers({ + sched: function() { + return schedule.find({}, {sort: {timestamp: 1}, limit: 5}).fetch(); + }, + + mostrecent: function() { + return schedule.find({}, {sort: {timestamp: 1}, limit: 1}).fetch(); + }, + allowed: function() { if (!(Meteor.user() === undefined) && Meteor.user().services.google.email in allowedu) { return true @@ -24,7 +26,7 @@ Template.client.helpers({ } -}) +}); Template.client.events({ "focus input": function() { @@ -47,4 +49,22 @@ Template.client.events({ post = document.getElementById('post').value; Meteor.call('add_button', this, pre, post); } -}) \ No newline at end of file +}); + +Template.day.helpers({ + pretext: function() { + return this.pretext; + }, + aftertext: function() { + return this.aftertext; + } +}); + +Template.recent.helpers({ + pretext: function() { + return this.pretext; + }, + aftertext: function() { + return this.aftertext; + } +}); \ No newline at end of file From 820c8ff911afb52fb856d64a098ba00607a7b43a Mon Sep 17 00:00:00 2001 From: yamanq Date: Sun, 7 Feb 2016 02:04:30 -0500 Subject: [PATCH 04/44] small html fix --- scheduleac/client/client.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scheduleac/client/client.html b/scheduleac/client/client.html index e7c3429..27c9c57 100644 --- a/scheduleac/client/client.html +++ b/scheduleac/client/client.html @@ -19,7 +19,6 @@ \ No newline at end of file From 7438a6df128938b84271d271751a8ee09911f37d Mon Sep 17 00:00:00 2001 From: yamanq Date: Wed, 10 Feb 2016 08:10:32 -0500 Subject: [PATCH 22/44] fixed remove button position --- scheduleac/client/client.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/scheduleac/client/client.css b/scheduleac/client/client.css index 8a5db64..993169d 100644 --- a/scheduleac/client/client.css +++ b/scheduleac/client/client.css @@ -168,8 +168,9 @@ h1 { .fa { float:right; clear:right; - margin-top: -50%; - margin-right:-18%; + position: fixed; + top: 3%; + right: 2.5%; -webkit-transition: color 0.5s ease; -moz-transition: color 0.5s ease; From fb377b2625e103a5f7a71a23dd368c498d55bf76 Mon Sep 17 00:00:00 2001 From: yamanq Date: Wed, 10 Feb 2016 11:58:21 -0500 Subject: [PATCH 23/44] added update feature --- scheduleac/server/serve.js | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/scheduleac/server/serve.js b/scheduleac/server/serve.js index e09d9e2..7fff191 100644 --- a/scheduleac/server/serve.js +++ b/scheduleac/server/serve.js @@ -28,11 +28,20 @@ Meteor.methods({ add_button: function(chrome, pre, post) { if ((Meteor.user() != undefined) && (Meteor.user().services.google.email in allowed) && !(pre === "")) { mymoment = moment(pre.replace("/", "-"), "MM-DD-YYYY"); - schedule.insert({ - "pretext": mymoment.toISOString().split("T")[0], + thepretext = mymoment.toISOString().split("T")[0]; + time = mymoment.format("X"); + previous = schedule.find({"pretext": thepretext}).fetch(); + if (previous.length > 0) { + entry = previous[0] + schedule.update(entry._id, {"aftertext": post, "pretext": entry.pretext, "timestamp": entry.timestamp}); + } else { + schedule.insert({ + "pretext": thepretext, "aftertext": post, - "timestamp": mymoment.format("X") - }); + "timestamp": time + }); + } + } }, remove: function(chrome) { From 3014336d6c07c64d6b0eae4bd82c9c427a1096c0 Mon Sep 17 00:00:00 2001 From: yamanq Date: Thu, 11 Feb 2016 18:10:16 -0500 Subject: [PATCH 24/44] mobile support --- scheduleac/.meteor/packages | 1 + scheduleac/.meteor/versions | 1 + scheduleac/client/client.html | 11 ++++++++++- scheduleac/client/client.js | 25 +++++++++++++++++++++++++ scheduleac/server/serve.js | 2 +- 5 files changed, 38 insertions(+), 2 deletions(-) diff --git a/scheduleac/.meteor/packages b/scheduleac/.meteor/packages index d9c80df..5d22b3a 100644 --- a/scheduleac/.meteor/packages +++ b/scheduleac/.meteor/packages @@ -26,3 +26,4 @@ ongoworks:security percolate:synced-cron momentjs:moment fortawesome:fontawesome +mystor:device-detection diff --git a/scheduleac/.meteor/versions b/scheduleac/.meteor/versions index 118a253..30713b7 100644 --- a/scheduleac/.meteor/versions +++ b/scheduleac/.meteor/versions @@ -53,6 +53,7 @@ mobile-status-bar@1.0.6 momentjs:moment@2.11.2 mongo@1.1.3 mongo-id@1.0.1 +mystor:device-detection@0.2.0 npm-mongo@1.4.39_1 oauth@1.1.6 oauth2@1.1.5 diff --git a/scheduleac/client/client.html b/scheduleac/client/client.html index 6d6da45..acd4ce0 100644 --- a/scheduleac/client/client.html +++ b/scheduleac/client/client.html @@ -3,7 +3,11 @@ - {{> client}} + {{#if isDesktop}} + {{> client}} + {{else}} + {{> phone}} + {{/if}} @@ -59,4 +63,9 @@ Github + + + \ No newline at end of file diff --git a/scheduleac/client/client.js b/scheduleac/client/client.js index 7a9cb26..297fac3 100644 --- a/scheduleac/client/client.js +++ b/scheduleac/client/client.js @@ -3,6 +3,7 @@ var clicked = false; allowedu["ybq987@gmail.com"] = true; allowedu["dweinger@bloomfield.org"] = true; allowedu["ksjdragon@gmail.com"]= true; +currentcard = 0; Meteor.subscribe('schedule'); @@ -159,5 +160,29 @@ function getScale(index, start) { } +Template.phone.helpers({ + pretext: function() { + cole = schedule.find({}, {sort: {timestamp: 1}}).fetch(); + date = moment(cole[currentcard].pretext); + date = date.calendar(null, { + sameDay: '[Today]', + nextDay: '[Tomorrow]', + nextWeek: 'dddd', + lastDay: '[Yesterday]', + lastWeek: '[Last] dddd', + sameElse: 'DD/MM/YYYY' + }); + return date + }, + aftertext: function() { + cole = schedule.find({}, {sort: {timestamp: 1}}).fetch(); + return cole[currentcard].aftertext; + } +}); +Template.phone.events({ + 'click nextb': function() { + currentcard += 1; + } +}); diff --git a/scheduleac/server/serve.js b/scheduleac/server/serve.js index 7fff191..f317408 100644 --- a/scheduleac/server/serve.js +++ b/scheduleac/server/serve.js @@ -10,7 +10,7 @@ schedule.permit(['insert', 'update', 'remove']).never().apply(); SyncedCron.add({ name: 'Remove Entries past today', schedule: function(parser) { - return parser.recur().on('07:46:00').time(); + return parser.recur().on('00:00:00').time(); }, job: function() { var today = moment().format("X"); From d1e2d7053ef577d4e505a04540cccccbaa1d11ad Mon Sep 17 00:00:00 2001 From: ksjdragon Date: Thu, 11 Feb 2016 17:13:48 -0500 Subject: [PATCH 25/44] some mure css --- scheduleac/client/client.css | 26 ++++++++++++-------------- scheduleac/client/client.js | 11 ----------- 2 files changed, 12 insertions(+), 25 deletions(-) diff --git a/scheduleac/client/client.css b/scheduleac/client/client.css index 993169d..a694302 100644 --- a/scheduleac/client/client.css +++ b/scheduleac/client/client.css @@ -8,12 +8,11 @@ html { -webkit-user-select: none; -moz-user-select: none; -ms-user-select: none; - overflow: hidden; } body { background-image: url('./bg.png'); - overflow: hidden; + overflow-x: hidden; } h1 { @@ -63,11 +62,13 @@ h1 { .login-display-name { display: none !important; } + .login-button { margin-left: 20% !important; width: 100% !important; height: 28px !important; } + .eachDay { position: relative; font-family: Lato; @@ -90,12 +91,11 @@ h1 { } .eachDay:hover { - -webkit-transform: scale(1.02); - -moz-transform: scale(1.02); - -ms-transform: scale(1.02); - transform: scale(1.02); + -webkit-transform: scale(1.05); + -moz-transform: scale(1.05); + -ms-transform: scale(1.05); + transform: scale(1.05); } - .recent { color: #353535; background-color: #5BEF78; @@ -117,8 +117,8 @@ h1 { } .pulltab { - position:absolute; - margin-top:4%; + position:fixed; + margin-top:-1%; width: 0; height: 0; border-top: 40px solid transparent; @@ -141,7 +141,7 @@ h1 { } .sidebar { - position:absolute; + position: fixed; min-height:100%; background-color: #FF746B; @@ -155,7 +155,7 @@ h1 { font-family: Lato; min-height: 100%; min-width: 17%; - position: absolute; + position: fixed; top: 0; left: -20%; @@ -166,9 +166,7 @@ h1 { } .fa { - float:right; - clear:right; - position: fixed; + position: absolute; top: 3%; right: 2.5%; diff --git a/scheduleac/client/client.js b/scheduleac/client/client.js index 297fac3..bab4bec 100644 --- a/scheduleac/client/client.js +++ b/scheduleac/client/client.js @@ -144,17 +144,6 @@ Template.sidebar.events({ } }) -Template.day.rendered = function() { - $('.eachDay').each(function ( index ) { - $('.eachDay').eq(index) - .css("z-index", 100-index) - .css("-webkit-transform", "scale(" + getScale(index, 0) + ")") - .css("-moz-transform", "scale(" + getScale(index, 0) + ")") - .css("-ms-transform", "scale(" + getScale(index, 0) + ")") - .css("transform", "scale(" + getScale(index, 0) + ")"); - }) -} - function getScale(index, start) { return Math.abs(index-start) * -0.2 + 1.5 } From 549d31d4d14264de630f840e4ab2ddb13f31987d Mon Sep 17 00:00:00 2001 From: ksjdragon Date: Thu, 11 Feb 2016 17:26:38 -0500 Subject: [PATCH 26/44] more css changes --- scheduleac/client/client.css | 19 ++++++++++--------- scheduleac/client/client.js | 13 ++++++++++++- 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/scheduleac/client/client.css b/scheduleac/client/client.css index a694302..33f4ef3 100644 --- a/scheduleac/client/client.css +++ b/scheduleac/client/client.css @@ -62,13 +62,11 @@ h1 { .login-display-name { display: none !important; } - .login-button { margin-left: 20% !important; width: 100% !important; height: 28px !important; } - .eachDay { position: relative; font-family: Lato; @@ -91,11 +89,12 @@ h1 { } .eachDay:hover { - -webkit-transform: scale(1.05); - -moz-transform: scale(1.05); - -ms-transform: scale(1.05); - transform: scale(1.05); + -webkit-transform: scale(1.02); + -moz-transform: scale(1.02); + -ms-transform: scale(1.02); + transform: scale(1.02); } + .recent { color: #353535; background-color: #5BEF78; @@ -118,7 +117,7 @@ h1 { .pulltab { position:fixed; - margin-top:-1%; + margin-top:0%; width: 0; height: 0; border-top: 40px solid transparent; @@ -141,7 +140,7 @@ h1 { } .sidebar { - position: fixed; + position:absolute; min-height:100%; background-color: #FF746B; @@ -166,9 +165,11 @@ h1 { } .fa { + float:right; + clear:right; position: absolute; top: 3%; - right: 2.5%; + right: 2.3%; -webkit-transition: color 0.5s ease; -moz-transition: color 0.5s ease; diff --git a/scheduleac/client/client.js b/scheduleac/client/client.js index bab4bec..e1e5f0d 100644 --- a/scheduleac/client/client.js +++ b/scheduleac/client/client.js @@ -144,9 +144,20 @@ Template.sidebar.events({ } }) +/*Template.day.rendered = function() { + $('.eachDay').each(function ( index ) { + $('.eachDay').eq(index) + .css("z-index", 100-index) + .css("-webkit-transform", "scale(" + getScale(index, 0) + ")") + .css("-moz-transform", "scale(" + getScale(index, 0) + ")") + .css("-ms-transform", "scale(" + getScale(index, 0) + ")") + .css("transform", "scale(" + getScale(index, 0) + ")"); + }) +} + function getScale(index, start) { return Math.abs(index-start) * -0.2 + 1.5 -} +}*/ Template.phone.helpers({ From fc7defd1eeb8c1efc1c644e5d1b2e30f558caaa9 Mon Sep 17 00:00:00 2001 From: yamanq Date: Thu, 11 Feb 2016 19:11:57 -0500 Subject: [PATCH 27/44] css + mobile --- scheduleac/client/client.css | 9 ++++++++- scheduleac/client/client.html | 8 +++++--- scheduleac/client/client.js | 27 +++------------------------ scheduleac/server/serve.js | 2 +- 4 files changed, 17 insertions(+), 29 deletions(-) diff --git a/scheduleac/client/client.css b/scheduleac/client/client.css index 33f4ef3..d4dac93 100644 --- a/scheduleac/client/client.css +++ b/scheduleac/client/client.css @@ -18,6 +18,7 @@ body { h1 { font-family: Lato; font-size: 300%; + margin-left: 4.2%; } #date { @@ -62,10 +63,12 @@ h1 { .login-display-name { display: none !important; } + .login-button { margin-left: 20% !important; width: 100% !important; height: 28px !important; + float: right; } .eachDay { position: relative; @@ -97,8 +100,12 @@ h1 { .recent { color: #353535; + font-size: 160%; background-color: #5BEF78; - max-width:30%; + min-width:40%; + max-width:40%; + padding-top:3%; + padding-bottom:3%; } .scheduleList { diff --git a/scheduleac/client/client.html b/scheduleac/client/client.html index acd4ce0..500826f 100644 --- a/scheduleac/client/client.html +++ b/scheduleac/client/client.html @@ -59,13 +59,15 @@ {{/if}}
-

Developed by Yaman Qalieh and Kenny Jao

+

Developed by Yaman Qalieh

+

Visuals by Kenny Jao

Github
\ No newline at end of file diff --git a/scheduleac/client/client.js b/scheduleac/client/client.js index e1e5f0d..ce0b7bd 100644 --- a/scheduleac/client/client.js +++ b/scheduleac/client/client.js @@ -16,7 +16,7 @@ Template.client.helpers({ mostrecent: function() { return schedule.find({}, {sort: {timestamp: 1}, limit: 1}).fetch(); - }, + } }); @@ -161,28 +161,7 @@ function getScale(index, start) { Template.phone.helpers({ - pretext: function() { - cole = schedule.find({}, {sort: {timestamp: 1}}).fetch(); - date = moment(cole[currentcard].pretext); - date = date.calendar(null, { - sameDay: '[Today]', - nextDay: '[Tomorrow]', - nextWeek: 'dddd', - lastDay: '[Yesterday]', - lastWeek: '[Last] dddd', - sameElse: 'DD/MM/YYYY' - }); - return date - }, - - aftertext: function() { - cole = schedule.find({}, {sort: {timestamp: 1}}).fetch(); - return cole[currentcard].aftertext; - } -}); - -Template.phone.events({ - 'click nextb': function() { - currentcard += 1; + phone: function() { + return schedule.find({}, {sort: {timestamp: 1}, limit: 1}).fetch(); } }); diff --git a/scheduleac/server/serve.js b/scheduleac/server/serve.js index f317408..0d844eb 100644 --- a/scheduleac/server/serve.js +++ b/scheduleac/server/serve.js @@ -1,7 +1,7 @@ var allowed = {}; allowed["ybq987@gmail.com"] = true; allowed["dweinger@bloomfield.org"] = true; -allowed["ksjdragon@gmail.com"] = true; +//allowed["ksjdragon@gmail.com"] = true; schedule.permit(['insert', 'update', 'remove']).never().apply(); From 919d0b9896a140b3d2722783c3e7aff10c095755 Mon Sep 17 00:00:00 2001 From: yamanq Date: Thu, 11 Feb 2016 19:52:59 -0500 Subject: [PATCH 28/44] polish --- scheduleac/client/client.css | 24 ++++++++++++++---------- scheduleac/client/client.html | 14 +++++++------- scheduleac/server/serve.js | 2 +- 3 files changed, 22 insertions(+), 18 deletions(-) diff --git a/scheduleac/client/client.css b/scheduleac/client/client.css index d4dac93..bffe71d 100644 --- a/scheduleac/client/client.css +++ b/scheduleac/client/client.css @@ -68,14 +68,11 @@ h1 { margin-left: 20% !important; width: 100% !important; height: 28px !important; - float: right; } .eachDay { position: relative; font-family: Lato; - color: #353535; max-width: 30%; - background-color: #136FB5; box-shadow: 4px 5px 3px 2px #444; margin-left: auto; margin-right: auto; @@ -85,10 +82,10 @@ h1 { padding-left: 3%; padding-right: 5%; - -webkit-transition: transform 0.5s ease; - -moz-transition: transform 0.5s ease; - -ms-transition: transform 0.5s ease; - transition: transform 0.5s ease; + -webkit-transition: transform 0.5s ease, background-color 0.5s ease; + -moz-transition: transform 0.5s ease, background-color 0.5s ease; + -ms-transition: transform 0.5s ease, background-color 0.5s ease; + transition: transform 0.5s ease, background-color 0.5s ease; } .eachDay:hover { @@ -101,9 +98,8 @@ h1 { .recent { color: #353535; font-size: 160%; - background-color: #5BEF78; - min-width:40%; - max-width:40%; + min-width:45%; + max-width:45%; padding-top:3%; padding-bottom:3%; } @@ -122,6 +118,14 @@ h1 { padding-top:2%; } +.AC { + background-color: #5BEF78; +} + +.Health { + background-color: #136FB5; +} + .pulltab { position:fixed; margin-top:0%; diff --git a/scheduleac/client/client.html b/scheduleac/client/client.html index 500826f..be544f2 100644 --- a/scheduleac/client/client.html +++ b/scheduleac/client/client.html @@ -19,10 +19,12 @@