From a329b4b08e7e28daa57735488cf00f0fd6435baa Mon Sep 17 00:00:00 2001 From: Yaman Qalieh Date: Thu, 8 Sep 2016 17:11:35 -0400 Subject: [PATCH] tabbing --- hourglass/.meteor/packages | 1 + hourglass/.meteor/versions | 9 + hourglass/client/admin/admin.html | 312 +++++++++++++++--------------- hourglass/client/admin/admin.js | 132 ++++++------- hourglass/lib/router.js | 36 ++-- 5 files changed, 249 insertions(+), 241 deletions(-) diff --git a/hourglass/.meteor/packages b/hourglass/.meteor/packages index 30d33c8..957d4d9 100644 --- a/hourglass/.meteor/packages +++ b/hourglass/.meteor/packages @@ -33,3 +33,4 @@ eternicode:bootstrap-datepicker shell-server@0.2.1 http@1.2.9 underscore +houston:admin diff --git a/hourglass/.meteor/versions b/hourglass/.meteor/versions index adcb2a3..dcacdf0 100644 --- a/hourglass/.meteor/versions +++ b/hourglass/.meteor/versions @@ -1,6 +1,7 @@ accounts-base@1.2.11 accounts-google@1.0.10 accounts-oauth@1.1.13 +accounts-password@1.1.13 accounts-ui@1.1.9 accounts-ui-unstyled@1.1.12 alanning:roles@1.2.15 @@ -21,6 +22,7 @@ callback-hook@1.0.9 check@1.2.3 coffeescript@1.2.4_1 dandv:caret-position@2.1.1 +dburles:mongo-collection-instances@0.3.4 ddp@1.2.5 ddp-client@1.3.1 ddp-common@1.2.6 @@ -31,6 +33,7 @@ diff-sequence@1.0.6 ecmascript@0.5.8 ecmascript-runtime@0.3.14 ejson@1.0.12 +email@1.0.16 es5-shim@4.6.14 eternicode:bootstrap-datepicker@1.6.0_3 fastclick@1.0.12 @@ -38,6 +41,7 @@ fortawesome:fontawesome@4.5.0 geojson-utils@1.0.9 google@1.1.14 hot-code-push@1.0.4 +houston:admin@2.0.7 html-tools@1.0.10 htmljs@1.0.10 http@1.2.9 @@ -51,6 +55,7 @@ iron:middleware-stack@1.1.0 iron:router@1.0.13 iron:url@1.0.11 jquery@1.11.9 +lai:collection-extensions@0.1.4 launch-screen@1.0.12 less@2.7.5 livedata@1.0.18 @@ -70,6 +75,7 @@ modules-runtime@0.7.6 momentjs:moment@2.14.4 mongo@1.1.12 mongo-id@1.0.5 +npm-bcrypt@0.8.6_3 npm-mongo@1.5.48 oauth@1.1.11 oauth2@1.1.10 @@ -88,13 +94,16 @@ routepolicy@1.0.11 rzymek:fullcalendar@2.7.2 service-configuration@1.0.10 session@1.1.6 +sha@1.0.8 shell-server@0.2.1 spacebars@1.0.12 spacebars-compiler@1.0.12 +srp@1.0.9 standard-minifier-css@1.2.0 standard-minifier-js@1.2.0 templating@1.2.14 templating-tools@1.0.4 +tmeasday:paginated-subscription@0.2.4 tracker@1.1.0 ui@1.0.11 underscore@1.0.9 diff --git a/hourglass/client/admin/admin.html b/hourglass/client/admin/admin.html index e70977f..ab4add5 100644 --- a/hourglass/client/admin/admin.html +++ b/hourglass/client/admin/admin.html @@ -1,161 +1,163 @@ diff --git a/hourglass/client/admin/admin.js b/hourglass/client/admin/admin.js index a1ec733..410dfde 100644 --- a/hourglass/client/admin/admin.js +++ b/hourglass/client/admin/admin.js @@ -1,78 +1,74 @@ +/* jshint esversion: 6 */ Session.set("adminTab","aClasses"); Template.admin.helpers({ - banner() { - return "background-image:url(" + Session.get("user").banner + ")"; - }, - filters() { - return [{filter:"Lol"}]; - }, - adminTab(val) { - return Session.equals("adminTab",val); - }, - adminTabColor(val) { - var value = {true:"header",false:"adminButtons"}; - return themeColors[Session.get("user").preferences.theme][value[Session.equals("adminTab",val)]]; - }, - collection(val) { - switch(val) { - case "classes": - var userClasses = classes.find().fetch(); - for(var i = 0; i < userClasses.length; i++) { - if(userClasses[i].privacy) { - userClasses[i].privacy = "True"; - } else { - userClasses[i].privacy = "False"; - } + banner() { + return "background-image:url(" + Session.get("user").banner + ")"; + }, + filters() { + return [{filter:"Lol"}]; + }, + adminTab(val) { + return Session.equals("adminTab",val); + }, + adminTabColor(val) { + var value = {true:"header",false:"adminButtons"}; + return themeColors[Session.get("user").preferences.theme][value[Session.equals("adminTab",val)]]; + }, + collection(val) { + switch(val) { + case "classes": + var userClasses = classes.find().fetch(); + for(var i = 0; i < userClasses.length; i++) { + userClasses[i].privacy = userClasses[i].privacy.toString(); - if(userClasses[i].code === "") { - userClasses[i].code = "None"; - } - userClasses[i].category = userClasses[i].category.charAt(0).toUpperCase() + userClasses[i].category.slice(1); - userClasses[i].admin = getEmail(userClasses[i].admin); - var types = ["subscribers","moderators","banned"]; - for(var j = 0; j < types.length; j++) { + if(userClasses[i].code === "") { + userClasses[i].code = "None"; + } + userClasses[i].category = userClasses[i].category; + userClasses[i].admin = getEmail(userClasses[i].admin); + var types = ["subscribers","moderators","banned"]; + for(var j = 0; j < types.length; j++) { - if(userClasses[i][types[j]].length === 0) { - userClasses[i][types[j]][k] = {"email":"None","none":false}; - continue; - } + if(userClasses[i][types[j]].length === 0) { + userClasses[i][types[j]][k] = {"email":"None","none":false}; + continue; + } - for(var k = 0; k < userClasses[i][types[j]].length; k++) { - userClasses[i][types[j]][k] = { - "email": getEmail(userClasses[i][types[j]][k]), - "none":true - }; - } - } - } - return userClasses; - break; - case "users": - break; - case "work": - break; - case "schools": - break; - case "requests": - break; - } - } + for(var k = 0; k < userClasses[i][types[j]].length; k++) { + userClasses[i][types[j]][k] = { + "email": getEmail(userClasses[i][types[j]][k]), + "none":true + }; + } + } + } + return userClasses; + case "users": + break; + case "work": + break; + case "schools": + break; + case "requests": + break; + } + } }); Template.admin.events({ - 'click #adminTabs li' (event) { - Session.set("adminTab",event.target.id); - }, - 'click .fa-files-o' (event) { - document.getElementById("copyArea").value = event.target.parentNode.childNodes[3].childNodes[0].nodeValue; - document.getElementById("copyArea").select(); - document.execCommand("copy"); - }, - 'click .fa-pencil-square-o' (event) { - var value = event.target.parentNode.childNodes[3].className.replace("modify ",""); - openDivFade(document.getElementsByClassName("overlay")[0]); - } + 'click #adminTabs li' (event) { + Session.set("adminTab",event.target.id); + }, + 'click .fa-files-o' (event) { + document.getElementById("copyArea").value = event.target.parentNode.childNodes[3].childNodes[0].nodeValue; + document.getElementById("copyArea").select(); + document.execCommand("copy"); + }, + 'click .fa-pencil-square-o' (event) { + var value = event.target.parentNode.childNodes[3].className.replace("modify ",""); + openDivFade(document.getElementsByClassName("overlay")[0]); + } }); function openDivFade(div) { @@ -91,5 +87,5 @@ function closeDivFade(div) { } function getEmail(id) { - return Meteor.users.findOne({_id:id}).services.google.email; -} \ No newline at end of file + return Meteor.users.findOne({_id:id}).services.google.email; +} diff --git a/hourglass/lib/router.js b/hourglass/lib/router.js index ed6b0e2..6486d30 100644 --- a/hourglass/lib/router.js +++ b/hourglass/lib/router.js @@ -58,24 +58,24 @@ Router.route('/user/:email', { } }); -Router.route('/admin', { - waitOn: function() { - return [ - Meteor.subscribe('classes', this.params._id), - Meteor.subscribe('schools', this.params._id), - Meteor.subscribe('work', this.params._id), - Meteor.subscribe('requests', this.params._id), - Meteor.subscribe('users', this.params._id) - ]; - }, - action: function() { - if (!Roles.userIsInRole(Meteor.userId(), ['admin', 'superadmin'])) { - this.render("NotFound"); - } else { - this.render("admin"); - } - } -}); +// Router.route('/admin', { +// waitOn: function() { +// return [ +// Meteor.subscribe('classes', this.params._id), +// Meteor.subscribe('schools', this.params._id), +// Meteor.subscribe('work', this.params._id), +// Meteor.subscribe('requests', this.params._id), +// Meteor.subscribe('users', this.params._id) +// ]; +// }, +// action: function() { +// if (!Roles.userIsInRole(Meteor.userId(), ['admin', 'superadmin'])) { +// this.render("NotFound"); +// } else { +// this.render("admin"); +// } +// } +// }); Router.configure({ notFoundTemplate: "NotFound"