hiro/Vulcan
1
0
Fork 0
mirror of https://github.com/vale981/Vulcan synced 2025-03-06 01:51:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Route to user_edit page until the profile is complete.

Browse source
This commit is contained in:
Tom Coleman 2012-10-01 12:11:08 +10:00
parent 68a81c9164
commit e8bed27752
6 changed files with 122 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
client/app.js
View file

@ -20,103 +20,6 @@ Meteor.subscribe('settings', function(){
Session.set('state', 'list');
if (Meteor.is_client) {
SimpleRouter = FilteredRouter.extend({
initialize: function() {
FilteredRouter.prototype.initialize.call(this);
this.filter(this.require_login, {only: ['submit']});
this.filter(this.start_request);
},
start_request: function(page){
Session.set("error", null);
Session.set("openedComments", null);
return page;
},
require_login: function(page) {
if (Meteor.user()) {
return page;
} else {
return 'signin';
}
},
routes: {
'': 'top',
'top':'top',
'new':'new',
'test':'test',
'signin':'signin',
'signup':'signup',
'submit':'submit',
'posts/deleted':'post_deleted',
'posts/:id/edit':'post_edit',
'posts/:id':'post',
'comments/deleted':'comment_deleted',
'comments/:id':'comment',
'comments/:id/edit':'comment_edit',
'settings':'settings',
'users':'users',
'account':'user_edit',
'forgot_password':'forgot_password',
'users/:id': 'user_profile',
'users/:id/edit':'user_edit'
},
top: function() { this.goto('posts_top'); },
new: function() { this.goto('posts_new'); },
signup: function() { this.goto('signup'); },
signin: function() { this.goto('signin'); },
submit: function() { this.goto('post_submit'); },
settings: function() { this.goto('settings'); },
users: function() { this.goto('users'); },
post_deleted: function() { this.goto('post_deleted'); },
comment_deleted: function() { this.goto('comment_deleted'); },
forgot_password: function() { this.goto('user_password'); },
post: function(id) {
console.log("post, id="+id);
Session.set('selected_post_id', id);
this.goto('post_page');
// on post page, we show the comment recursion
window.repress_recursion=false;
// reset the new comment time at each new request of the post page
window.newCommentTimestamp=new Date();
},
post_edit: function(id) {
console.log("post_edit, id="+id);
Session.set('selected_post_id', id);
this.goto('post_edit');
},
comment: function(id) {
console.log("comment, id="+id);
Session.set('selected_comment_id', id);
this.goto('comment_page');
window.repress_recursion=true;
window.newCommentTimestamp=new Date();
},
comment_edit: function(id) {
console.log("comment_edit, id="+id);
Session.set('selected_comment_id', id);
this.goto('comment_edit');
window.newCommentTimestamp=new Date();
},
user_profile: function(id){
if(typeof id !== undefined){
window.selected_user_id=id;
}
this.goto('user_profile');
},
user_edit: function(id){
if(typeof id !== undefined){
window.selected_user_id=id;
}
this.goto('user_edit');
}
});
var Router = new SimpleRouter();
Meteor.startup(function() {
Backbone.history.start({pushState: true});
});
}
$.fn.exists = function () {
return this.length !== 0;
}

105
client/lib/router.js Normal file
View file

@ -0,0 +1,105 @@
SimpleRouter = FilteredRouter.extend({
initialize: function() {
FilteredRouter.prototype.initialize.call(this);
this.filter(this.require_login, {only: ['submit']});
this.filter(this.start_request);
this.filter(this.require_profile);
},
start_request: function(page){
Session.set("error", null);
Session.set("openedComments", null);
return page;
},
require_login: function(page) {
if (Meteor.user()) {
return page;
} else {
return 'signin';
}
},
// if the user is logged in but their profile isn't filled out enough
require_profile: function(page) {
var user = Meteor.user();
if (user && !user.loading && !userProfileComplete(user))
return 'user_edit';
else
return page;
},
routes: {
'': 'top',
'top':'top',
'new':'new',
'test':'test',
'signin':'signin',
'signup':'signup',
'submit':'submit',
'posts/deleted':'post_deleted',
'posts/:id/edit':'post_edit',
'posts/:id':'post',
'comments/deleted':'comment_deleted',
'comments/:id':'comment',
'comments/:id/edit':'comment_edit',
'settings':'settings',
'users':'users',
'account':'user_edit',
'forgot_password':'forgot_password',
'users/:id': 'user_profile',
'users/:id/edit':'user_edit'
},
top: function() { this.goto('posts_top'); },
new: function() { this.goto('posts_new'); },
signup: function() { this.goto('signup'); },
signin: function() { this.goto('signin'); },
submit: function() { this.goto('post_submit'); },
settings: function() { this.goto('settings'); },
users: function() { this.goto('users'); },
post_deleted: function() { this.goto('post_deleted'); },
comment_deleted: function() { this.goto('comment_deleted'); },
forgot_password: function() { this.goto('user_password'); },
post: function(id) {
console.log("post, id="+id);
Session.set('selected_post_id', id);
this.goto('post_page');
// on post page, we show the comment recursion
window.repress_recursion=false;
// reset the new comment time at each new request of the post page
window.newCommentTimestamp=new Date();
},
post_edit: function(id) {
console.log("post_edit, id="+id);
Session.set('selected_post_id', id);
this.goto('post_edit');
},
comment: function(id) {
console.log("comment, id="+id);
Session.set('selected_comment_id', id);
this.goto('comment_page');
window.repress_recursion=true;
window.newCommentTimestamp=new Date();
},
comment_edit: function(id) {
console.log("comment_edit, id="+id);
Session.set('selected_comment_id', id);
this.goto('comment_edit');
window.newCommentTimestamp=new Date();
},
user_profile: function(id){
if(typeof id !== undefined){
window.selected_user_id=id;
}
this.goto('user_profile');
},
user_edit: function(id){
if(typeof id !== undefined){
window.selected_user_id=id;
}
this.goto('user_edit');
}
});
var Router = new SimpleRouter();
Meteor.startup(function() {
Backbone.history.start({pushState: true});
});

5
client/templates/user_edit.html
View file

@ -1,6 +1,11 @@
<template name="user_edit">
<div class="grid-small grid-block dialog user-edit">
{{#with user}}
{{#if profileIncomplete}}
<div>
Please complete your profile below before continuing.
</div>
{{/if}}
<form>
<h2>Account</h2>
<div class="control-group">

4
client/templates/user_edit.js
View file

@ -34,6 +34,10 @@ Template.user_edit.events = {
};
Template.user_edit.profileIncomplete = function() {
return !userProfileComplete(this);
}
Template.user_edit.user = function(){
var current_user=Meteor.user();
if(window.selected_user_id && !current_user.loading && current_user.isAdmin){

4
lib/helpers.js
View file

@ -16,10 +16,6 @@ getSetting = function(setting){
return '';
}
getCurrentUserEmail = function(){
return Meteor.user() ? Meteor.user().emails[0].email : '';
}
trackEvent = function(event, properties){
var properties= (typeof properties === 'undefined') ? {} : properties;
if(typeof mixpanel.track != 'undefined'){

8
lib/users.js Normal file
View file

@ -0,0 +1,8 @@
// Useful methods on users
getCurrentUserEmail = function(){
return Meteor.user() ? Meteor.user().emails[0].email : '';
}
userProfileComplete = function(user) {
return !!user.profile.email;
}