wassname/HackFlowy
1
0
Fork 0
mirror of https://github.com/wassname/HackFlowy.git synced 2026-07-17 11:23:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Heroku integration with foreman

Browse Source 
Add foreman configuration for Heroku:
- To test production configuration execute NODE_ENV=production foreman
  start
- Database connection configuration now handles "use_env_variable" which
  should be defined as a environment variable such as "DATABASE_URL"
  with a proper database URI connection string, ie:
  postgres://user:password@db.example.com:5432/database
- Added package.json configuration to run migrations and db seed after
  `npm install`

Update frontend models to match sequelize definition.
Update views to work according to the changes above.
Handling isCompleted and parentId apropiately for PostgreSQL databases
This commit is contained in:
DC*
2014-08-14 22:05:54 -03:00
parent 64cea269a9
commit b4d3eab02c
9 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/javascripts/models/task.js
+5 -5
View File
@@ -9,20 +9,20 @@ Backbone
var TaskModel = Backbone.Model.extend({
defaults: {
parent_id: '',
parentId: 0,
content: '',
is_completed:'n'
isCompleted: 0
},
toggelCompletedStatus:function(isCompleted){
var prev_isCompleted = isCompleted,
self = this;
this.save({'is_completed':isCompleted},
this.save({'isCompleted':isCompleted},
{
success:function(){},
error:function(){
//REVERT BACK ON ERROR
self.set({'is_completed':prev_isCompleted});
self.set({'isCompleted':prev_isCompleted});
}
})
}
@@ -31,4 +31,4 @@ Backbone
return TaskModel;
});
});
public/javascripts/views/list.js
+2 -2
View File
@@ -37,8 +37,8 @@ TaskView
model: task
});
var a = taskView.render();
if (a.model.get('parent_id')!=0)
a.$el.insertAfter($('*[data-id="'+a.model.get('parent_id')+'"]').parents('li:first'));
if (a.model.get('parentId')!=0)
a.$el.insertAfter($('*[data-id="'+a.model.get('parentId')+'"]').parents('li:first'));
else
this.$el.append(a.el);
}
public/javascripts/views/task.js
+19 -19
View File
@@ -38,7 +38,7 @@ taskTemplate
var task = this;
this.socket.on('task', function(data){
if (task.model.id == data.id) {
task.model.set({'content':data.content, 'is_completed':data.is_completed});
task.model.set({'content':data.content, 'isCompleted':data.isCompleted});
}
});
},
@@ -47,9 +47,9 @@ taskTemplate
var tmpl = _.template(this.template);
var task = this;
this.$el.html(tmpl({model:this.model.toJSON()}));
if (this.model.get('parent_id')!=0) {
if (this.model.get('parentId')!=0) {
this.$el.addClass('shift1');
var className = $('*[data-id="'+this.model.get('parent_id')+'"]').parents('li:first').attr('class');
var className = $('*[data-id="'+this.model.get('parentId')+'"]').parents('li:first').attr('class');
if (className!=undefined && className!=0 && className.substring(0,5) == 'shift') {
this.$el.removeClass();
this.$el.addClass('shift' + (parseInt(className.charAt(5))+1));
@@ -74,31 +74,31 @@ taskTemplate
if (e.shiftKey && e.keyCode == 9) {
var model = this.$el.next('li').find('input').data('id');
model = Tasks.get(model);
var old_parent = model.get('parent_id');
var old_parent = model.get('parentId');
old_parent = Tasks.get(old_parent);
var new_parent = old_parent.get('parent_id');
var new_parent = old_parent.get('parentId');
if (new_parent == null) new_parent = 0;
model.set('parent_id',new_parent);
model.save({content: model.get('content'), parent_id: model.get('parent_id')});
model.set('parentId',new_parent);
model.save({content: model.get('content'), parentId: model.get('parentId')});
}
else if (e.keyCode == 9) {
var parent = this.$el.prev('li').prev('li').find('input').data('id');
var current = this.$el.prev('li').find('input').data('id');
var model = Tasks.get(current);
model.set('parent_id',parent);
model.save({content: model.get('content'), parent_id: model.get('parent_id')});
model.set('parentId',parent);
model.save({content: model.get('content'), parentId: model.get('parentId')});
}
this.socket.emit('task', {
id: this.model.id,
parent_id: this.model.parent_id,
parentId: this.model.parentId,
content: this.$input.val().trim(),
is_completed:this.model.toJSON().is_completed
isCompleted:this.model.toJSON().isCompleted
});
},
update: function(e) {
if ( e.which === constants.ENTER_KEY ) {
Tasks.add({content:'', parent_id: this.model.get('parent_id')});
Tasks.add({content:'', parentId: this.model.get('parentId')});
this.$input.blur();
this.$el.next('li').find('input').focus();
}
@@ -110,7 +110,7 @@ taskTemplate
this.model.destroy();
}
else {
this.model.save({content: value, parent_id: this.model.attributes.parent_id});
this.model.save({content: value, parentId: this.model.attributes.parentId});
}
this.$el.removeClass('editing');
},
@@ -124,22 +124,22 @@ taskTemplate
},
markComplete:function(){
this.model.toggelCompletedStatus('Y');
this.model.toggelCompletedStatus(true);
this.socket.emit('task', {
id: this.model.id,
parent_id: this.model.parent_id,
parentId: this.model.parentId,
content:this.model.toJSON().content,
is_completed: this.model.toJSON().is_completed
isCompleted: this.model.toJSON().isCompleted
});
},
unmarkComlete:function(){
this.model.toggelCompletedStatus('N');
this.model.toggelCompletedStatus(false);
this.socket.emit('task', {
id: this.model.id,
parent_id: this.model.parent_id,
parentId: this.model.parentId,
content:this.model.toJSON().content,
is_completed: this.model.toJSON().is_completed
isCompleted: this.model.toJSON().isCompleted
});
},