Merge branch 'master' of https://github.com/yamanq/chromebook-checkout-meteor

chromebook-checkout-meteor/client/router.js

@@ -19,16 +19,17 @@ Router.route('/login', function() {
 });
 
 Router.route('/admin', function() {
-  if (Meteor.user().roles[0]==='admin') {
+  if (Roles.userIsInRole(Meteor.userId(), ['admin'])) {
     this.render("admin");
   } else {
-    this.redirect('/checkout');
+    this.redirect('/login');
   }
 });
+
 Router.route('/teacher', function() {
-  if (Meteor.user().roles[0]==='teacher') {
+  if (Roles.userIsInRole(Meteor.userId(), ['admin', 'teacher'])) {
     this.render("teacher");
   } else {
-    this.redirect('/checkout');
+    this.redirect('/login');
   }
 });

chromebook-checkout-meteor/server/users.js

@@ -14,9 +14,7 @@ Meteor.publish('chromebook', function() {
 var adminusers = [
   "ybq987@gmail.com",
   "mminer@bloomfield.org",
-  "qalieh.yaman90@bloomfield.org",
+  "qalieh.yaman90@bloomfield.org"
-  "ksjdragon@gmail.com",
-  "chthomas@bloomfield.org"
 ];
 for (var i = 0; i < adminusers.length; i++) {
   var adminuser = adminusers[i];