\
\
@@ -73,8 +74,8 @@ app.factory('GridFactory', function($http, $compile, PageFactory, ProjectFactory
// add an Add Widget Button to the newly nested grid
$("#" + id + " .lasso-button-box")
.append($compile("")(scope));
- console.log("newgridid", newGridID);
- console.log("nested grids:", GridFactory.nestedGrids);
+ console.log("newgridid", newGridID); // @OB/ND dead code
+ console.log("nested grids:", GridFactory.nestedGrids); // @OB/ND dead code
}
GridFactory.removeWidget = function(idNum) {
diff --git a/browser/js/common/factories/PageFactory.js b/browser/js/common/factories/PageFactory.js
index 05678ee..9cd2b1f 100644
--- a/browser/js/common/factories/PageFactory.js
+++ b/browser/js/common/factories/PageFactory.js
@@ -6,7 +6,7 @@ app.factory('PageFactory', function($rootScope, $http){
.then(function(page){
return page.data
}, function(err){
- return err;
+ return err; // @OB/ND beware!
})
}
@@ -15,7 +15,7 @@ app.factory('PageFactory', function($rootScope, $http){
.then(function(pages){
return pages.data
}, function(err){
- return err;
+ return err; // @OB/ND beware!
})
}
@@ -24,7 +24,7 @@ app.factory('PageFactory', function($rootScope, $http){
.then(function(page){
return page.data
}, function(err){
- return err;
+ return err; // @OB/ND beware!
})
}
@@ -33,7 +33,7 @@ app.factory('PageFactory', function($rootScope, $http){
.then(function(page){
return page.data
}, function(err){
- return err;
+ return err; // @OB/ND beware!
})
}
@@ -42,7 +42,7 @@ app.factory('PageFactory', function($rootScope, $http){
.then(function(page){
return page.data
}, function(err){
- return err;
+ return err; // @OB/ND beware!
})
}
diff --git a/browser/js/common/factories/ProjectFactory.js b/browser/js/common/factories/ProjectFactory.js
index 7b1aeea..434a155 100644
--- a/browser/js/common/factories/ProjectFactory.js
+++ b/browser/js/common/factories/ProjectFactory.js
@@ -7,7 +7,7 @@ app.factory('ProjectFactory', function($http){
.then(function(project){
return project.data
}, function(err){
- return err;
+ return err; // @OB/ND beware!
})
}
@@ -16,7 +16,7 @@ app.factory('ProjectFactory', function($http){
.then(function(project){
return project.data
}, function(err){
- return err;
+ return err; // @OB/ND beware!
})
}
@@ -25,7 +25,7 @@ app.factory('ProjectFactory', function($http){
.then(function(project){
return project.data
}, function(err){
- return err;
+ return err; // @OB/ND beware!
})
}
@@ -34,7 +34,7 @@ app.factory('ProjectFactory', function($http){
.then(function(project){
return project.data
}, function(err){
- return err;
+ return err; // @OB/ND beware!
})
}
diff --git a/browser/js/common/factories/UserFactory.js b/browser/js/common/factories/UserFactory.js
index 7dfc1ce..d4882ac 100644
--- a/browser/js/common/factories/UserFactory.js
+++ b/browser/js/common/factories/UserFactory.js
@@ -6,7 +6,7 @@ app.factory('UserFactory', function($rootScope, $http){
.then(function(user){
return user.data
}, function(err){
- return err;
+ return err; // @OB/ND beware!
})
}
@@ -15,7 +15,7 @@ app.factory('UserFactory', function($rootScope, $http){
.then(function(users){
return users.data
}, function(err){
- return err;
+ return err; // @OB/ND beware!
})
}
@@ -24,7 +24,7 @@ app.factory('UserFactory', function($rootScope, $http){
.then(function(user){
return user.data
}, function(err){
- return err;
+ return err; // @OB/ND beware!
})
}
@@ -33,7 +33,7 @@ app.factory('UserFactory', function($rootScope, $http){
.then(function(user){
return user.data
}, function(err){
- return err;
+ return err; // @OB/ND beware!
})
}
@@ -42,7 +42,7 @@ app.factory('UserFactory', function($rootScope, $http){
.then(function(user){
return user.data
}, function(err){
- return err;
+ return err; // @OB/ND beware!
})
}
diff --git a/browser/js/create-layout/create-layout-controller.js b/browser/js/create-layout/create-layout-controller.js
index 350dd09..03f4132 100644
--- a/browser/js/create-layout/create-layout-controller.js
+++ b/browser/js/create-layout/create-layout-controller.js
@@ -1,5 +1,6 @@
app.controller("CreateLayoutCtrl", function($scope, $compile, AuthService, GridCompFactory, GridFactory) {
+ // @OB/ND could use resolve instead
AuthService.getLoggedInUser().then(function (user) {
if(user) {
$scope.user = user;
@@ -11,13 +12,14 @@ app.controller("CreateLayoutCtrl", function($scope, $compile, AuthService, GridC
$scope.nestedGrids = GridFactory.getNestedGrids();
$scope.addNewGridElement = function (grid, content){
- GridFactory.addNewGridElement($scope, grid, content);
+ GridFactory.addNewGridElement($scope, grid, content); // @OB/ND we don't think you need to pass scope through (though you'd have to refactor the factory method)
}
$scope.addNestedGrid = function(id) {
GridFactory.addNestedGrid($scope, id);
}
+ // @OB/ND $scope.removeWidget = GridFactory.removeWidget
$scope.removeWidget = function(idNum) {
GridFactory.removeWidget(idNum);
}
diff --git a/server/app/routes/pages/index.js b/server/app/routes/pages/index.js
index c682e66..6fb4e93 100644
--- a/server/app/routes/pages/index.js
+++ b/server/app/routes/pages/index.js
@@ -2,12 +2,12 @@
var router = require('express').Router();
module.exports = router;
-var Page = require('../../../db/models/page.js');
+var Page = require('../../../db/models/page.js'); // @OB/ND alternative is to do mongoose.model('Project')
router.param('id', function (req, res, next, id){
- req.id = req.params.id;
+ req.id = req.params.id; // @OB/ND does not seem all that useful
next();
})
@@ -22,7 +22,7 @@ router.get('/', function (req, res, next){
router.get('/:id', function (req, res, next){
Page.findById(req.id)
.then(function ( page ){
- res.status(201).send( page );
+ res.status(201).send( page ); // @OB/ND 201 is non-standard here
})
.then(null, next);
})
@@ -30,7 +30,7 @@ router.get('/:id', function (req, res, next){
router.put('/:id', function (req, res, next){
Page.findByIdAndUpdate(req.id, req.body, {new: true})
.then(function ( page ){
- res.status(201).send( page );
+ res.status(201).send( page ); // @OB/ND 201 is non-standard here
})
.then(null, next);
})
diff --git a/server/app/routes/projects/index.js b/server/app/routes/projects/index.js
index 362634f..168e082 100644
--- a/server/app/routes/projects/index.js
+++ b/server/app/routes/projects/index.js
@@ -2,10 +2,10 @@
var router = require('express').Router();
module.exports = router;
-var Project = require('../../../db/models/project.js');
-
+var Project = require('../../../db/models/project.js'); // @OB/ND alternative is to do mongoose.model('Project')
+// @OB/ND dead code below...though actually why not use a router.param
// router.param('id', function (req, res, next, id){
// req.id = req.params.id;
// next();
@@ -22,15 +22,15 @@ router.get('/', function (req, res, next){
router.get('/:id', function (req, res, next){
Project.findById( req.params.id)
.then(function ( project ){
- res.status(201).send( project );
+ res.status(201).send( project ); // @OB/ND 201 is non-standard here
})
.then(null, next);
})
router.put('/:id', function (req, res, next){
- Project.findByIdAndUpdate( req.params.id, req.body, {new: true})
+ Project.findByIdAndUpdate( req.params.id, req.body, {new: true}) // @OB/ND some hooks won't fire
.then(function ( project ){
- res.status(201).send( project );
+ res.status(201).send( project ); // @OB/ND 201 is non-standard here
})
.then(null, next);
})
@@ -41,7 +41,7 @@ router.post('/', function (req, res, next){
res.status(201).send(project);
})
.then(null, function(err){
- console.log("in post project router fail")
+ console.log("in post project router fail") // @OB/ND dead code
err.status = 400;
next(err);
})
diff --git a/server/db/models/page.js b/server/db/models/page.js
index fa182fe..41c729f 100644
--- a/server/db/models/page.js
+++ b/server/db/models/page.js
@@ -4,10 +4,10 @@ var ObjectId = mongoose.Schema.Types.ObjectId;
var PageSchema = new mongoose.Schema({
project: {type: ObjectId, ref: "Project", required: true},
- name: { type: String, unique: true, required: true},
+ name: { type: String, unique: true, required: true}, // @OB/ND could be problematic
html: String,
css: String,
- grid: {}
+ grid: {} // @OB/ND what is this for?
})
module.exports = mongoose.model('Page', PageSchema);
\ No newline at end of file