Merge branch 'master' of github.com:okfocus/vvalls

3 files changed, 16 insertions, 4 deletions

diff --git a/server/lib/api/media.js b/server/lib/api/media.js
index 1eb08c1..4e2fad5 100644
--- a/server/lib/api/media.js
+++ b/server/lib/api/media.js
@@ -10,13 +10,19 @@ var _ = require('lodash'),
 var media = {
 
 	user: function(req, res){
+	  var offset = Number(req.query.offset) || 0
+	  var limit = Math.min( Number(req.query.limit), 50 ) || 20
 	  var query = { user_id: req.user._id }
 	  if (req.query.tag) {
 	    query.tag = req.query.tag
 	  }
-		Media.find(query, function(err, media){
-			res.json(media || [])
-		})
+		Media.find(query)
+			.sort({'created_at': -1})
+			.skip(offset)
+			.limit(limit)
+		  .exec(function(err, media){
+				res.json(media || [])
+			})
 	},
 	
 	create: function(req, res){
diff --git a/server/lib/api/projects.js b/server/lib/api/projects.js
index 47e0458..1bf046f 100644
--- a/server/lib/api/projects.js
+++ b/server/lib/api/projects.js
@@ -36,11 +36,13 @@ var projects = {
 		data.name = util.sanitize(data.name)
 		data.slug = util.slugify(data.name) + "-" + (+new Date)
 		data.description = util.sanitize(data.description)
+		data.viewHeight = Number(data.viewHeight || 0)
 		data.rooms = JSON.parse(data.rooms)
 		data.walls = JSON.parse(data.walls)
 		data.media = JSON.parse(data.media)
 		data.colors = JSON.parse(data.colors)
 		data.startPosition = JSON.parse(data.startPosition)
+		data.lastPosition = JSON.parse(data.lastPosition)
 		data.created_at = new Date ()
 
 		upload.put("projects", req.files.thumbnail, {
@@ -94,6 +96,7 @@ var projects = {
           data.slug = util.slugify(data.name) + "-" + (+new Date)
         }
         data.description = util.sanitize(data.description)
+        data.viewHeight = Number(data.viewHeight || 0)
         data.updated_at = new Date ()
 
 				_.extend(doc, data)
@@ -102,7 +105,8 @@ var projects = {
 				doc.walls = JSON.parse(data.walls)
 				doc.colors = JSON.parse(data.colors)
 				doc.media = JSON.parse(data.media)
-				doc.startPosition = JSON.parse(data.startPosition)
+        doc.startPosition = JSON.parse(data.startPosition)
+        doc.lastPosition = JSON.parse(data.lastPosition)
 
 				doc.save(function(err, doc){
 					if (err || ! doc) { return res.json({ error: err }) }
diff --git a/server/lib/schemas/Project.js b/server/lib/schemas/Project.js
index dd50da6..a923d85 100644
--- a/server/lib/schemas/Project.js
+++ b/server/lib/schemas/Project.js
@@ -32,6 +32,8 @@ var ProjectSchema = new mongoose.Schema({
 	media: [mongoose.Schema.Types.Mixed],
 	colors: mongoose.Schema.Types.Mixed,
 	startPosition: mongoose.Schema.Types.Mixed,
+	lastPosition: mongoose.Schema.Types.Mixed,
+	viewHeight: { type: Number },
 	user_id: { type: mongoose.Schema.ObjectId, index: true },
 	created_at: { type: Date },
 	updated_at: { type: Date },