merge

3 files changed, 33 insertions, 1 deletions

diff --git a/server/lib/schemas/Collaborator.js b/server/lib/schemas/Collaborator.js
new file mode 100644
index 0000000..6b3d452
--- /dev/null
+++ b/server/lib/schemas/Collaborator.js
@@ -0,0 +1,30 @@
+/* jshint node: true */
+
+var mongoose = require('mongoose'),
+	_ = require('lodash'),
+	crypto = require('crypto'),
+	config = require('../../../config.json'),
+	util = require('../util');
+
+var CollaboratorSchema = new mongoose.Schema({
+	email: { type: String, required: true},
+	project_id: { type: mongoose.Schema.ObjectId, index: true },
+	user_id: { type: mongoose.Schema.ObjectId, index: true },
+	nonce: {
+		type: String,
+		default: "",
+	},
+	created_at: { type: Date },
+	updated_at: { type: Date },
+})
+
+CollaboratorSchema.statics.makeNonce = function(cb){
+	crypto.pseudoRandomBytes(256, function (err, buf){
+		var shasum = crypto.createHash('sha1')
+		shasum.update(buf)
+		cb( shasum.digest('hex') )
+	})
+}
+
+module.exports = exports = mongoose.model('collaborator', CollaboratorSchema);
+exports.schema = CollaboratorSchema;
diff --git a/server/lib/schemas/Media.js b/server/lib/schemas/Media.js
index 1f26b8e..1de354d 100644
--- a/server/lib/schemas/Media.js
+++ b/server/lib/schemas/Media.js
@@ -41,7 +41,8 @@ var MediaSchema = new mongoose.Schema({
 	loop: { type: Boolean, default: false },
 	mute: { type: Boolean, default: true },
 	keyframe: { type: Number, default: 0.0 },
-
+	tag: { type: String, default: "" },
+	
 	widthDimension: { type: Number },
 	heightDimension: { type: Number },
 	units: { type: String },
diff --git a/server/lib/schemas/Project.js b/server/lib/schemas/Project.js
index 0f54eaa..abf34fb 100644
--- a/server/lib/schemas/Project.js
+++ b/server/lib/schemas/Project.js
@@ -30,6 +30,7 @@ var ProjectSchema = new mongoose.Schema({
 	rooms: [mongoose.Schema.Types.Mixed],
 	walls: [mongoose.Schema.Types.Mixed],
 	media: [mongoose.Schema.Types.Mixed],
+	colors: mongoose.Schema.Types.Mixed,
 	startPosition: mongoose.Schema.Types.Mixed,
 	user_id: { type: mongoose.Schema.ObjectId, index: true },
 	created_at: { type: Date },