Merged main & websocket server, refactored libs, image uploads fixes

models/upl-file.js

@@ -0,0 +1,51 @@
+"use strict";
+
+const modb = require('mongoose'),
+			Promise = require('bluebird'),
+			_ = require('lodash');
+
+/**
+ * Upload File schema
+ *
+ * @type       {<Mongoose.Schema>}
+ */
+var uplFileSchema = modb.Schema({
+
+	_id: String,
+
+  category: {
+    type: String,
+    required: true,
+    default: 'binary'
+  },
+  mime: {
+    type: String,
+    required: true,
+    default: 'application/octet-stream'
+  },
+  extra: {
+    type: Object
+  },
+  folder: {
+    type: String,
+    ref: 'UplFolder'
+  },
+  filename: {
+    type: String,
+    required: true
+  },
+  basename: {
+    type: String,
+    required: true
+  },
+  filesize: {
+    type: Number,
+    required: true
+  }
+
+},
+{
+	timestamps: {}
+});
+
+module.exports = modb.model('UplFile', uplFileSchema);