Updated versions

db/seed/initial_tasks.js

@@ -2,7 +2,7 @@ var config = require('config'),
     orm = require('../../orm').configure(config.get('database')),
     Tasks = require('../../db/models/task').instance(orm);
 
-Tasks.destroy().success(function() {
+Tasks.destroy({where: {}}).then(function() {
     Tasks.bulkCreate([
         {content: 'Welcome to HackFlowy!', isCompleted: false},
         {content: 'An open-source WorkFlowy clone', isCompleted: false},

package.json

@@ -1,30 +1,31 @@
 {
-    "name": "hackflowy",
+  "name": "hackflowy",
-    "version": "0.0.1",
+  "version": "0.0.2",
-    "description": "A simple WorkFlowy clone",
+  "description": "A simple WorkFlowy clone",
-    "dependencies": {
+  "dependencies": {
-        "express": "~3.1.0",
+    "config": "~1.19.0",
-        "path": "~0.4.9",
+    "express": "<4.0.0",
-        "pg": "~3.4.1",
+    "path": "~0.12.7",
-        "sequelize": "~1.7.9",
+    "pg": "~3.4.1",
-        "socket.io": "~1.0.6",
+    "sequelize": "~3.17.3",
-        "config": "~1.0.2"
+    "sequelize-cli": "^2.3.1",
-    },
+    "socket.io": "~1.4.4"
-    "devDependencies": {
+  },
-        "sqlite3": "~2.1.0"
+  "devDependencies": {
-    },
+    "sqlite3": "~3.1.1"
-    "engines": {
+  },
-        "node": "0.10.x",
+  "engines": {
-        "npm": "3.3.5"
+    "node": "5.4.x",
-    },
+    "npm": "3.3.11"
-    "scripts": {
+  },
-        "start": "node server.js",
+  "scripts": {
-        "db:migrate": "./node_modules/sequelize/bin/sequelize -m --config config/database.json",
+    "start": "node server.js",
-        "db:seed": "node db/seed/initial_tasks.js",
+    "db:migrate": "./node_modules/.bin/sequelize -m --config config/database.json",
-        "postinstall": "npm run db:migrate && npm run db:seed"
+    "db:seed": "node db/seed/initial_tasks.js",
-    },
+    "postinstall": "npm run db:migrate && npm run db:seed"
-    "repository": {
+  },
-        "type": "git",
+  "repository": {
-        "url": "git://github.com/abhshkdz/HackFlowy.git"
+    "type": "git",
-    }
+    "url": "git://github.com/abhshkdz/HackFlowy.git"
+  }
 }

server.js

@@ -1,64 +1,68 @@
 var application_root = __dirname,
-  express = require('express'),
+    express = require('express'),
-  app = express(),
+    app = express(),
-  path = require('path'),
+    path = require('path'),
-  config = require('config'),
+    config = require('config'),
-  orm = require('./orm').configure(config.get('database')),
+    orm = require('./orm').configure(config.get('database')),
-  Tasks = require('./db/models/task').instance(orm),
+    Tasks = require('./db/models/task').instance(orm),
-  server = require('http').createServer(app),
+    server = require('http').createServer(app),
-  io = require('socket.io').listen(server);
+    socket = require('socket.io')
 
-app.configure(function() {
+
-  app.use(express.bodyParser());
+app.use(express.bodyParser());
-  app.use(express.methodOverride());
+app.use(express.methodOverride());
-  app.use(app.router);
+app.use(app.router);
-  app.use(express.static( path.join( application_root, 'public')));
+app.use(express.static(path.join(application_root, 'public')));
-  app.use(express.errorHandler({dumpExceptions: true, showStack: true}));
+app.use(express.errorHandler({
-});
+    dumpExceptions: true,
+    showStack: true
+}));
 
 var port = process.env.PORT || config.get('port');
-server.listen(port, function() {
+server.listen(port, function () {
-  console.log( 'Express server listening on port %d in %s mode', port, app.settings.env );
+    console.log('Express server listening on port %d in %s mode', port, app.settings.env);
 });
+var io = socket.listen(server);
 
-app.get('/tasks', function(req,res){
+app.get('/tasks', function (req, res) {
-  Tasks.all().success(function(tasks){
+    Tasks.all().then(function (tasks) {
-    res.send(tasks);
+        res.send(tasks);
-  });
+    });
 });
 
-app.post('/tasks', function(req,res){
+app.post('/tasks', function (req, res) {
-  Tasks.create({
+    Tasks.create({
-    content: req.body.content,
+        content: req.body.content,
-    parent: parseInt(req.body.parent) || 0,
+        parent: parseInt(req.body.parent) || 0,
-    isCompleted: false
+        isCompleted: false
-  }).success(function(task){
+    }).then(function (task) {
-    res.send(task);
+        res.send(task);
-  });
+    });
 });
 
-app.put('/tasks/:id', function(req,res){
+app.put('/tasks/:id', function (req, res) {
-  console.log(req.body.isCompleted);
+    console.log(req.body.isCompleted);
-  Tasks.find(req.params.id).success(function(task){
+    Tasks.findById(req.params.id).then(function (task) {
-    task.content = req.body.content;
+        task.content = req.body.content;
-    task.parent = parseInt(req.body.parent) || 0,
+        task.parent = parseInt(req.body.parent) || 0,
-    task.isCompleted = req.body.isCompleted == 1;
+            task.isCompleted = req.body.isCompleted == 1;
-    task.save().success(function(task){
+        task.save().then(function (task) {
-      res.send(task);
+            res.send(task);
-    })
+        })
-  });
+    });
 });
 
-app.delete('/tasks/:id', function(req,res){
+app.delete('/tasks/:id', function (req, res) {
-  Tasks.find(req.params.id).success(function(task){
+    Tasks.findById(req.params.id).then(function (task) {
-    task.destroy().success(function(){
+        task.destroy().then(function () {
-        res.send('');
+            res.send('');
+        });
     });
-  })
 });
 
 io.sockets.on('connection', function (socket) {
-  socket.on('task', function (data) {
+    socket.on('task', function (data) {
-    socket.broadcast.emit('task', data);
+        console.log(data);
-  });
+        socket.broadcast.emit('task', data);
+    });
 });