cleanup

3 files changed, 15 insertions, 33 deletions

diff --git a/public/assets/javascripts/ui/site/LayoutsModal.js b/public/assets/javascripts/ui/site/LayoutsModal.js
index b620b58..87251af 100644
--- a/public/assets/javascripts/ui/site/LayoutsModal.js
+++ b/public/assets/javascripts/ui/site/LayoutsModal.js
@@ -16,7 +16,7 @@ var LayoutsIndex = View.extend({
 
 	populate: function(data){
 /*
-	  if (data.user.plan_level < 1 && data.projectCounts.free == 1) {
+	  if (data.user.plan_level < 1 && data.projectCount == 1) {
 	    // show lockout message
 	  }
 */
diff --git a/server/lib/api/layouts.js b/server/lib/api/layouts.js
index a3edc38..f1db121 100644
--- a/server/lib/api/layouts.js
+++ b/server/lib/api/layouts.js
@@ -9,13 +9,16 @@ var _ = require('lodash'),
 
 var layouts = {
 	index: function(req, res){
-		Layout.find({}, function(err, docs){
-			res.json({
-			  layouts: docs,
-			  user: res.locals.user,
-			  layoutCounts: res.locals.layoutCounts,
-			  projectCounts: res.locals.projectCounts,
-			})
+		Layout.find({ is_stock: true }, function(err, stock_layouts){
+      Layout.find({ user_id: req.user._id }, function(err, user_layouts){
+        res.json({
+          layouts: stock_layouts,
+          user_layouts: user_layouts,
+          user: res.locals.user,
+          layoutCount: res.locals.layoutCount,
+          projectCount: res.locals.projectCount,
+        })
+      })
 		})
 	},
 
diff --git a/server/lib/middleware.js b/server/lib/middleware.js
index fe4dc49..94c4acd 100644
--- a/server/lib/middleware.js
+++ b/server/lib/middleware.js
@@ -68,22 +68,8 @@ var middleware = {
   ensureUserProjectsCount: function(req, res, next){
     var counts = { stock: 0, basic: 0, pro: 0 }
     res.locals.projectCounts = counts
-    Project.count({ user_id: req.user.id, layout_type: 0 }, function(err, count){
-      res.locals.projectCounts.stock = count || 0
-      if (req.user.plan_level > 0) { return middleware.ensureBasicProjectsCount(req, res, next) }
-      else next()
-    })
-  },
-  ensureBasicProjectsCount: function(req, res, next){
-    Project.count({ user_id: req.user.id, layout_type: 1 }, function(err, count){
-      res.locals.projectCounts.basic = count || 0
-      if (req.user.plan_level > 1) { return middleware.ensureProProjectsCount(req, res, next) }
-      else next()
-    })
-  },
-  ensureProProjectsCount: function(req, res, next){
-    Project.count({ user_id: req.user.id, layout_type: 2 }, function(err, count){
-      res.locals.projectCounts.pro = count || 0
+    Project.count({ user_id: req.user._id }, function(err, count){
+      res.locals.projectCount = count || 0
       next()
     })
   },
@@ -93,15 +79,8 @@ var middleware = {
     res.locals.layoutCounts = counts
     if (req.user.plan_level == 0) { return next() }
 
-    Layout.count({ user_id: req.user.id, layout_type: 1 }, function(err, count){
-      res.locals.layoutCounts.basic = count || 0
-      if (req.user.plan_level > 1) { return middleware.ensureProLayoutsCount(req, res, next) }
-      else next()
-    })
-  },
-  ensureProLayoutsCount: function(req, res, next){
-    Project.count({ user_id: req.user.id, layout_type: 2 }, function(err, count){
-      res.locals.layoutCounts.pro = count || 0
+    Layout.count({ user_id: req.user._id }, function(err, count){
+      res.locals.layoutCount = count || 0
       next()
     })
   },