merge

1 files changed, 33 insertions, 11 deletions

diff --git a/server/lib/api/layouts.js b/server/lib/api/layouts.js
index 641e9e2..2c68f71 100644
--- a/server/lib/api/layouts.js
+++ b/server/lib/api/layouts.js
@@ -3,13 +3,26 @@
 var _ = require('lodash'),
 	util = require('../util'),
 	upload = require('../upload'),
+	middleware = require('../middleware'),
 	config = require('../../../config.json'),
+	Blueprint = require('../schemas/Blueprint'),
 	Layout = require('../schemas/Layout');
 
 var layouts = {
 	index: function(req, res){
-		Layout.find({}, function(err, docs){
-			res.json(docs)
+		Layout.find({ is_stock: true }, function(err, stock_layouts){
+      Layout.find({ user_id: req.user._id, is_stock: false }, function(err, user_layouts){
+        Blueprint.find({ user_id: req.user._id }, function(err, blueprints){
+          res.json({
+            layouts: stock_layouts,
+            user_layouts: user_layouts,
+            blueprints: blueprints,
+            user: res.locals.user,
+            layoutCount: res.locals.layoutCount,
+            projectCount: res.locals.projectCount,
+          })
+        })
+      })
 		})
 	},
 
@@ -37,15 +50,24 @@ var layouts = {
 		data.rooms = JSON.parse(data.rooms)
 		data.startPosition = JSON.parse(data.startPosition)
 
-		upload.put("layouts", req.files.thumbnail, {
-			unacceptable: function(err){
-				res.json({ error: { errors: { thumbnail: { message: "Problem saving thumbnail: " + err } } } })
-			},
-			success: function(url){
-				data.photo = url
-				done()
-			}
-		})
+    Layout.findOne({ slug: data.slug }, function(err, doc){
+      if (! err || doc) {
+        data.slug = data.slug + "-" + Date.now()
+      }
+      do_upload()
+    })
+    
+    function do_upload () {
+      upload.put("layouts", req.files.thumbnail, {
+        unacceptable: function(err){
+          res.json({ error: { errors: { thumbnail: { message: "Problem saving thumbnail: " + err } } } })
+        },
+        success: function(url){
+          data.photo = url
+          done()
+        }
+      })
+    }
 
 		function done() {
 			new Layout(data).save(function(err, doc){