kjao/archive
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
ksjdragon 2015-01-31 22:33:18 -05:00
commit a60544bc58
4 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
chromebook-checkout-meteor/.meteor/versions
View File

@ -55,7 +55,7 @@ oauth@1.1.3
oauth2@1.1.2 oauth2@1.1.2
observe-sequence@1.0.4 observe-sequence@1.0.4
ordered-dict@1.0.2 ordered-dict@1.0.2
percolate:momentum@0.7.1 percolate:momentum@0.7.0
percolate:velocityjs@1.1.0 percolate:velocityjs@1.1.0
random@1.0.2 random@1.0.2
reactive-dict@1.0.5 reactive-dict@1.0.5

13
chromebook-checkout-meteor/client/initial.js
View File

@ -15,15 +15,6 @@ Template.initial.events({
window.open(links[randomint], "_blank"); window.open(links[randomint], "_blank");
}, },
'click .submit': function() { 'click .submit': function() {
Router.go('/checkout'); Router.go('/login');
} }
}) })
Template.login.events({
'click .chromeicon': function() {
var randomint = Math.floor(Math.random() * (links.length - 1));
window.open(links[randomint], "_blank");
},
'click .submit': function() {
Router.go('/checkout');
}
})

9
chromebook-checkout-meteor/client/login.js Normal file
View File

@ -0,0 +1,9 @@
Template.login.events({
'click .chromeicon': function() {
var randomint = Math.floor(Math.random() * (links.length - 1));
window.open(links[randomint], "_blank");
},
'click .submit': function() {
Router.go('/login');
}
})

15
chromebook-checkout-meteor/client/router.js
View File

@ -1,4 +1,4 @@
Router.route('/', function() { Router.route('/', function() {
this.render("initial"); this.render("initial");
}) })
@ -15,12 +15,13 @@ Router.route('/login', function() {
this.redirect('/teacher'); this.redirect('/teacher');
} else if (Roles.userIsInRole(Meteor.userId(), ['admin'])) { } else if (Roles.userIsInRole(Meteor.userId(), ['admin'])) {
this.redirect('/admin'); this.redirect('/admin');
} else if (Roles.userIsInRole(Meteor.userId(), ['admin', 'teacher'])) {
this.redirect('/admin');
} else if (Meteor.user()) {
this.redirect('/checkout');
} else { } else {
this.render("login"); if (Meteor.loggingIn()) {
Router.redirect('/login')
}
else {
this.redirect('/checkout');
};
} }
}); });
@ -36,6 +37,6 @@ Router.route('/teacher', function() {
if (Roles.userIsInRole(Meteor.userId(), ['admin', 'teacher'])) { if (Roles.userIsInRole(Meteor.userId(), ['admin', 'teacher'])) {
this.render("teacher"); this.render("teacher");
} else { } else {
this.redirect('/login'); this.redirect('/login');
} }
}); });