Added New Folder feature in Image Editor + Winston init refactor

agent.js

@@ -5,22 +5,14 @@
 // ===========================================
 
 global.ROOTPATH = __dirname;
+global.PROCNAME = 'AGENT';
 
 // ----------------------------------------
 // Load Winston
 // ----------------------------------------
 
 var _isDebug = process.env.NODE_ENV === 'development';
-
+global.winston = require('./lib/winston')(_isDebug);
-global.winston = require('winston');
-winston.remove(winston.transports.Console)
-winston.add(winston.transports.Console, {
-  level: (_isDebug) ? 'info' : 'warn',
-  prettyPrint: true,
-  colorize: true,
-  silent: false,
-  timestamp: true
-});
 
 // ----------------------------------------
 // Fetch internal handshake key

assets/js/app.js

@@ -1 +1 @@
-"use strict";function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function setInputSelection(e,t,a){if(e.focus(),"undefined"!=typeof e.selectionStart)e.selectionStart=t,e.selectionEnd=a;else if(document.selection&&document.selection.createRange){e.select();var o=document.selection.createRange();o.collapse(!0),o.moveEnd("character",a),o.moveStart("character",t),o.select()}}function makeSafePath(e){var t=_.split(_.trim(e),"/");return t=_.map(t,function(e){return _.kebabCase(_.deburr(_.trim(e)))}),_.join(_.filter(t,function(e){return!_.isEmpty(e)}),"/")}var _createClass=function(){function e(e,t){for(var a=0;a<t.length;a++){var o=t[a];o.enumerable=o.enumerable||!1,o.configurable=!0,"value"in o&&(o.writable=!0),Object.defineProperty(e,o.key,o)}}return function(t,a,o){return a&&e(t.prototype,a),o&&e(t,o),t}}();jQuery(document).ready(function(e){e("a").smoothScroll({speed:400,offset:-70});new Sticky(".stickyscroll");e(window).bind("beforeunload",function(){e("#notifload").addClass("active")}),e(document).ajaxSend(function(){e("#notifload").addClass("active")}).ajaxComplete(function(){e("#notifload").removeClass("active")});var t=new Alerts;alertsData&&_.forEach(alertsData,function(e){t.push(e)});var a=io(ioHost);if(jQuery(document).ready(function(e){if(e("#search-input").length){e("#search-input").focus(),Vue.transition("slide",{enterClass:"slideInDown",leaveClass:"fadeOutUp"}),e(".searchresults").css("display","block");var t=new Vue({el:"#header-container",data:{searchq:"",searchres:[],searchsuggest:[],searchload:0,searchactive:!1,searchmoveidx:0,searchmovekey:"",searchmovearr:[]},watch:{searchq:function(e,o){t.searchmoveidx=0,e.length>=3?(t.searchactive=!0,t.searchload++,a.emit("search",{terms:e},function(e){t.searchres=e.match,t.searchsuggest=e.suggest,t.searchmovearr=_.concat([],t.searchres,t.searchsuggest),t.searchload>0&&t.searchload--})):(t.searchactive=!1,t.searchres=[],t.searchsuggest=[],t.searchmovearr=[],t.searchload=0)},searchmoveidx:function(e,a){e>0?t.searchmovekey=t.searchmovearr[e-1].document?"res."+t.searchmovearr[e-1].document.entryPath:"sug."+t.searchmovearr[e-1]:t.searchmovekey=""}},methods:{useSuggestion:function(e){t.searchq=e},closeSearch:function(){t.searchq=""},moveSelectSearch:function(){if(!(t.searchmoveidx<1)){var e=t.searchmoveidx-1;t.searchmovearr[e].document?window.location.assign("/"+t.searchmovearr[e].document.entryPath):t.searchq=t.searchmovearr[e]}},moveDownSearch:function(){t.searchmoveidx<t.searchmovearr.length&&t.searchmoveidx++},moveUpSearch:function(){t.searchmoveidx>0&&t.searchmoveidx--}}});e("main").on("click",t.closeSearch)}}),e("#page-type-view").length&&!function(){var a="home"!==e("#page-type-view").data("entrypath")?e("#page-type-view").data("entrypath"):"",o=a+"/new-page";e(".btn-create-prompt").on("click",function(t){e("#txt-create-prompt").val(o),e("#modal-create-prompt").toggleClass("is-active"),setInputSelection(e("#txt-create-prompt").get(0),a.length+1,o.length),e("#txt-create-prompt").removeClass("is-danger").next().addClass("is-hidden")}),e("#txt-create-prompt").on("keypress",function(t){13===t.which&&e(".btn-create-go").trigger("click")}),e(".btn-create-go").on("click",function(t){var a=makeSafePath(e("#txt-create-prompt").val());_.isEmpty(a)?e("#txt-create-prompt").addClass("is-danger").next().removeClass("is-hidden"):(e("#txt-create-prompt").parent().addClass("is-loading"),window.location.assign("/create/"+a))}),""!==a&&e(".btn-move-prompt").removeClass("is-hidden");var n=_.lastIndexOf(a,"/")+1;e(".btn-move-prompt").on("click",function(t){e("#txt-move-prompt").val(a),e("#modal-move-prompt").toggleClass("is-active"),setInputSelection(e("#txt-move-prompt").get(0),n,a.length),e("#txt-move-prompt").removeClass("is-danger").next().addClass("is-hidden")}),e("#txt-move-prompt").on("keypress",function(t){13===t.which&&e(".btn-move-go").trigger("click")}),e(".btn-move-go").on("click",function(o){var n=makeSafePath(e("#txt-move-prompt").val());_.isEmpty(n)||n===a||"home"===n?e("#txt-move-prompt").addClass("is-danger").next().removeClass("is-hidden"):(e("#txt-move-prompt").parent().addClass("is-loading"),e.ajax(window.location.href,{data:{move:n},dataType:"json",method:"PUT"}).then(function(e,a,o){e.ok?window.location.assign("/"+n):t.pushError("Something went wrong",e.error)},function(e,a,o){t.pushError("Something went wrong","Save operation failed.")}))})}(),e("#page-type-create").length){var o;!function(){var n=e("#page-type-create").data("entrypath");e(".btn-create-discard").on("click",function(t){e("#modal-create-discard").toggleClass("is-active")}),1===e("#mk-editor").length&&!function(){var n=!1;Vue.filter("filesize",function(e){return _.toUpper(filesize(e))});var i=new Vue({el:"#modal-editor-image",data:{isLoading:!1,isLoadingText:"",newFolderName:"",newFolderShow:!1,fetchFromUrlURL:"",fetchFromUrlShow:!1,folders:[],currentFolder:"",currentImage:"",currentAlign:"left",images:[]},methods:{open:function(){nLine truncated
+"use strict";function _classCallCheck(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function setInputSelection(e,t,o){if(e.focus(),"undefined"!=typeof e.selectionStart)e.selectionStart=t,e.selectionEnd=o;else if(document.selection&&document.selection.createRange){e.select();var a=document.selection.createRange();a.collapse(!0),a.moveEnd("character",o),a.moveStart("character",t),a.select()}}function makeSafePath(e){var t=_.split(_.trim(e),"/");return t=_.map(t,function(e){return _.kebabCase(_.deburr(_.trim(e)))}),_.join(_.filter(t,function(e){return!_.isEmpty(e)}),"/")}var _createClass=function(){function e(e,t){for(var o=0;o<t.length;o++){var a=t[o];a.enumerable=a.enumerable||!1,a.configurable=!0,"value"in a&&(a.writable=!0),Object.defineProperty(e,a.key,a)}}return function(t,o,a){return o&&e(t.prototype,o),a&&e(t,a),t}}();jQuery(document).ready(function(e){e("a").smoothScroll({speed:400,offset:-70});new Sticky(".stickyscroll");e(window).bind("beforeunload",function(){e("#notifload").addClass("active")}),e(document).ajaxSend(function(){e("#notifload").addClass("active")}).ajaxComplete(function(){e("#notifload").removeClass("active")});var t=new Alerts;alertsData&&_.forEach(alertsData,function(e){t.push(e)});var o=io(ioHost);if(jQuery(document).ready(function(e){if(e("#search-input").length){e("#search-input").focus(),Vue.transition("slide",{enterClass:"slideInDown",leaveClass:"fadeOutUp"}),e(".searchresults").css("display","block");var t=new Vue({el:"#header-container",data:{searchq:"",searchres:[],searchsuggest:[],searchload:0,searchactive:!1,searchmoveidx:0,searchmovekey:"",searchmovearr:[]},watch:{searchq:function(e,a){t.searchmoveidx=0,e.length>=3?(t.searchactive=!0,t.searchload++,o.emit("search",{terms:e},function(e){t.searchres=e.match,t.searchsuggest=e.suggest,t.searchmovearr=_.concat([],t.searchres,t.searchsuggest),t.searchload>0&&t.searchload--})):(t.searchactive=!1,t.searchres=[],t.searchsuggest=[],t.searchmovearr=[],t.searchload=0)},searchmoveidx:function(e,o){e>0?t.searchmovekey=t.searchmovearr[e-1].document?"res."+t.searchmovearr[e-1].document.entryPath:"sug."+t.searchmovearr[e-1]:t.searchmovekey=""}},methods:{useSuggestion:function(e){t.searchq=e},closeSearch:function(){t.searchq=""},moveSelectSearch:function(){if(!(t.searchmoveidx<1)){var e=t.searchmoveidx-1;t.searchmovearr[e].document?window.location.assign("/"+t.searchmovearr[e].document.entryPath):t.searchq=t.searchmovearr[e]}},moveDownSearch:function(){t.searchmoveidx<t.searchmovearr.length&&t.searchmoveidx++},moveUpSearch:function(){t.searchmoveidx>0&&t.searchmoveidx--}}});e("main").on("click",t.closeSearch)}}),e("#page-type-view").length&&!function(){var o="home"!==e("#page-type-view").data("entrypath")?e("#page-type-view").data("entrypath"):"",a=o+"/new-page";e(".btn-create-prompt").on("click",function(t){e("#txt-create-prompt").val(a),e("#modal-create-prompt").toggleClass("is-active"),setInputSelection(e("#txt-create-prompt").get(0),o.length+1,a.length),e("#txt-create-prompt").removeClass("is-danger").next().addClass("is-hidden")}),e("#txt-create-prompt").on("keypress",function(t){13===t.which&&e(".btn-create-go").trigger("click")}),e(".btn-create-go").on("click",function(t){var o=makeSafePath(e("#txt-create-prompt").val());_.isEmpty(o)?e("#txt-create-prompt").addClass("is-danger").next().removeClass("is-hidden"):(e("#txt-create-prompt").parent().addClass("is-loading"),window.location.assign("/create/"+o))}),""!==o&&e(".btn-move-prompt").removeClass("is-hidden");var n=_.lastIndexOf(o,"/")+1;e(".btn-move-prompt").on("click",function(t){e("#txt-move-prompt").val(o),e("#modal-move-prompt").toggleClass("is-active"),setInputSelection(e("#txt-move-prompt").get(0),n,o.length),e("#txt-move-prompt").removeClass("is-danger").next().addClass("is-hidden")}),e("#txt-move-prompt").on("keypress",function(t){13===t.which&&e(".btn-move-go").trigger("click")}),e(".btn-move-go").on("click",function(a){var n=makeSafePath(e("#txt-move-prompt").val());_.isEmpty(n)||n===o||"home"===n?e("#txt-move-prompt").addClass("is-danger").next().removeClass("is-hidden"):(e("#txt-move-prompt").parent().addClass("is-loading"),e.ajax(window.location.href,{data:{move:n},dataType:"json",method:"PUT"}).then(function(e,o,a){e.ok?window.location.assign("/"+n):t.pushError("Something went wrong",e.error)},function(e,o,a){t.pushError("Something went wrong","Save operation failed.")}))})}(),e("#page-type-create").length){var a;!function(){var n=e("#page-type-create").data("entrypath");e(".btn-create-discard").on("click",function(t){e("#modal-create-discard").toggleClass("is-active")}),1===e("#mk-editor").length&&!function(){var n=!1;Vue.filter("filesize",function(e){return _.toUpper(filesize(e))});var r=new Vue({el:"#modal-editor-image",data:{isLoading:!1,isLoadingText:"",newFolderName:"",newFolderShow:!1,newFolderError:!1,fetchFromUrlURL:"",fetchFromUrlShow:!1,folders:[],currentFolder:"",currentImage:"",currentAlign:"left",images:[]},methods:Line truncated

client/js/components/editor-image.js

@@ -6,6 +6,7 @@ let vueImage = new Vue({
 		isLoadingText: '',
 		newFolderName: '',
 		newFolderShow: false,
+		newFolderError: false,
 		fetchFromUrlURL: '',
 		fetchFromUrlShow: false,
 		folders: [],
@@ -52,11 +53,38 @@ let vueImage = new Vue({
 
 		},
 		newFolder: (ev) => {
+			vueImage.newFolderName = '';
+			vueImage.newFolderError = false;
 			vueImage.newFolderShow = true;
+			_.delay(() => { $('#txt-editor-newfoldername').focus(); }, 400);
 		},
 		newFolderDiscard: (ev) => {
 			vueImage.newFolderShow = false;
 		},
+		newFolderCreate: (ev) => {
+
+			let regFolderName = new RegExp("^[a-z0-9][a-z0-9\-]*[a-z0-9]$");
+			vueImage.newFolderName = _.kebabCase(_.trim(vueImage.newFolderName));
+
+			if(_.isEmpty(vueImage.newFolderName) || !regFolderName.test(vueImage.newFolderName)) {
+				vueImage.newFolderError = true;
+				return;
+			}
+
+			vueImage.newFolderDiscard();
+			vueImage.isLoading = true;
+			vueImage.isLoadingText = 'Creating new folder...';
+
+			Vue.nextTick(() => {
+				socket.emit('uploadsCreateFolder', { foldername: vueImage.newFolderName }, (data) => {
+					vueImage.folders = data;
+					vueImage.currentFolder = vueImage.newFolderName;
+					vueImage.images = [];
+					vueImage.isLoading = false;
+				});
+			});
+
+		},
 		fetchFromUrl: (ev) => {
 			vueImage.fetchFromUrlShow = true;
 		},

lib/winston.js

@@ -0,0 +1,18 @@
+"use strict";
+
+var winston = require('winston');
+
+module.exports = (isDebug) => {
+
+	winston.remove(winston.transports.Console)
+	winston.add(winston.transports.Console, {
+		level: (isDebug) ? 'info' : 'warn',
+		prettyPrint: true,
+		colorize: true,
+		silent: false,
+		timestamp: true
+	});
+
+	return winston;
+
+};

models/config.js

@@ -25,6 +25,7 @@ module.exports = (confPath) => {
 		title: "Requarks Wiki",
 		host: "http://localhost",
 		port: process.env.PORT,
+		wsPort: 8080,
 		db: "mongodb://localhost/wiki",
 		redis: null,
 		sessionSecret: null,

models/git.js

@@ -72,13 +72,13 @@ module.exports = {
 
 		let self = this;
 
-		winston.info('[GIT] Checking Git repository...');
+		winston.info('[' + PROCNAME + '][GIT] Checking Git repository...');
 
 		//-> Check if path is accessible
 
 		return fs.mkdirAsync(self._repo.path).catch((err) => {
 			if(err.code !== 'EEXIST') {
-				winston.error('Invalid Git repository path or missing permissions.');
+				winston.error('[' + PROCNAME + '][GIT] Invalid Git repository path or missing permissions.');
 			}
 		}).then(() => {
 
@@ -116,10 +116,10 @@ module.exports = {
 			});
 
 		}).catch((err) => {
-			winston.error('Git remote error!');
+			winston.error('[' + PROCNAME + '][GIT] Git remote error!');
 			throw err;
 		}).then(() => {
-			winston.info('[GIT] Git repository is OK.');
+			winston.info('[' + PROCNAME + '][GIT] Git repository is OK.');
 			return true;
 		});
 
@@ -147,12 +147,12 @@ module.exports = {
 
 		// Fetch
 
-		winston.info('[GIT] Performing pull from remote repository...');
+		winston.info('[' + PROCNAME + '][GIT] Performing pull from remote repository...');
 		return self._git.pull('origin', self._repo.branch).then((cProc) => {
-			winston.info('[GIT] Pull completed.');
+			winston.info('[' + PROCNAME + '][GIT] Pull completed.');
 		})
 		.catch((err) => {
-			winston.error('Unable to fetch from git origin!');
+			winston.error('[' + PROCNAME + '][GIT] Unable to fetch from git origin!');
 			throw err;
 		})
 		.then(() => {
@@ -164,14 +164,14 @@ module.exports = {
 
 				if(_.includes(out, 'commit')) {
 
-					winston.info('[GIT] Performing push to remote repository...');
+					winston.info('[' + PROCNAME + '][GIT] Performing push to remote repository...');
 					return self._git.push('origin', self._repo.branch).then(() => {
-						return winston.info('[GIT] Push completed.');
+						return winston.info('[' + PROCNAME + '][GIT] Push completed.');
 					});
 
 				} else {
 
-					winston.info('[GIT] Push skipped. Repository is already in sync.');
+					winston.info('[' + PROCNAME + '][GIT] Push skipped. Repository is already in sync.');
 
 				}
 
@@ -181,7 +181,7 @@ module.exports = {
 
 		})
 		.catch((err) => {
-			winston.error('Unable to push changes to remote!');
+			winston.error('[' + PROCNAME + '][GIT] Unable to push changes to remote!');
 			throw err;
 		});
 

models/localdata.js

@@ -1,11 +1,13 @@
 "use strict";
 
-var fs = require('fs'),
+var path = require('path'),
-	path = require('path'),
 	loki = require('lokijs'),
 	Promise = require('bluebird'),
+	fs = Promise.promisifyAll(require('fs-extra')),
 	_ = require('lodash');
 
+var regFolderName = new RegExp("^[a-z0-9][a-z0-9\-]*[a-z0-9]$");
+
 /**
  * Local Data Storage
  *
@@ -114,36 +116,20 @@ module.exports = {
 	 */
 	createBaseDirectories(appconfig) {
 
-		winston.info('[SERVER] Create data directories if they don\'t exist...');
+		winston.info('[SERVER] Checking data directories...');
 
 		try {
-			fs.mkdirSync(appconfig.datadir.db);
+			fs.ensureDirSync(path.resolve(ROOTPATH, appconfig.datadir.db));
+			fs.ensureDirSync(path.resolve(ROOTPATH, appconfig.datadir.db, './cache'));
+			fs.ensureDirSync(path.resolve(ROOTPATH, appconfig.datadir.db, './thumbs'));
+
+			fs.ensureDirSync(path.resolve(ROOTPATH, appconfig.datadir.repo));
+			fs.ensureDirSync(path.resolve(ROOTPATH, appconfig.datadir.repo, './uploads'));
 		} catch (err) {
-			if(err.code !== 'EEXIST') {
+			winston.error(err);
-				winston.error(err);
-				process.exit(1);
-			}
 		}
 
-		try {
+		winston.info('[SERVER] Data and Repository directories are OK.');
-			fs.mkdirSync(path.join(appconfig.datadir.db, 'cache'));
-		} catch (err) {
-			if(err.code !== 'EEXIST') {
-				winston.error(err);
-				process.exit(1);
-			}
-		}
-
-		try {
-			fs.mkdirSync(path.join(appconfig.datadir.db, 'thumbs'));
-		} catch (err) {
-			if(err.code !== 'EEXIST') {
-				winston.error(err);
-				process.exit(1);
-			}
-		}
-
-		winston.info('[SERVER] Data directories are OK.');
 
 		return;
 
@@ -171,6 +157,32 @@ module.exports = {
 		return this._uploadsFolders;
 	},
 
+	/**
+	 * Creates an uploads folder.
+	 *
+	 * @param      {String}  folderName  The folder name
+	 * @return     {Promise}  Promise of the operation
+	 */
+	createUploadsFolder(folderName) {
+
+		let self = this;
+
+		folderName = _.kebabCase(_.trim(folderName));
+
+		if(_.isEmpty(folderName) || !regFolderName.test(folderName)) {
+			return Promise.resolve(self.getUploadsFolders());
+		}
+
+		return fs.ensureDirAsync(path.join(self._uploadsPath, folderName)).then(() => {
+			if(!_.includes(self._uploadsFolders, folderName)) {
+				self._uploadsFolders.push(folderName);
+				self._uploadsFolders = _.sortBy(self._uploadsFolders);
+			}
+			return self.getUploadsFolders();
+		});
+
+	},
+
 	/**
 	 * Sets the uploads files.
 	 *

server.js

@@ -5,23 +5,14 @@
 // ===========================================
 
 global.ROOTPATH = __dirname;
+global.PROCNAME = 'SERVER';
 
 // ----------------------------------------
 // Load Winston
 // ----------------------------------------
 
 var _isDebug = process.env.NODE_ENV === 'development';
-
+global.winston = require('./lib/winston')(_isDebug);
-global.winston = require('winston');
-winston.remove(winston.transports.Console)
-winston.add(winston.transports.Console, {
-  level: (_isDebug) ? 'info' : 'warn',
-  prettyPrint: true,
-  colorize: true,
-  silent: false,
-  timestamp: true
-});
-
 winston.info('[SERVER] Requarks Wiki is initializing...');
 
 // ----------------------------------------
@@ -66,7 +57,6 @@ var ctrl = autoload(path.join(ROOTPATH, '/controllers'));
 // ----------------------------------------
 
 global.app = express();
-var _isDebug = (app.get('env') === 'development');
 
 // ----------------------------------------
 // Security

views/modals/editor-image.pug

@@ -60,6 +60,7 @@
 					img(v-bind:src="'/uploads/t/' + img.uid + '.png'")
 					span: strong {{ img.basename }}
 					span {{ img.filesize | filesize }}
+				em(v-show="images.length < 1") This folder is empty.
 
 	.modal(v-bind:class="{ 'is-active': newFolderShow }")
 		.modal-background
@@ -72,8 +73,8 @@
 						.content
 							label.label Enter the new folder name:
 							p.control
-								input.input(type='text', placeholder='folder name', v-model='newFolderName')
+								input.input#txt-editor-newfoldername(type='text', placeholder='folder name', v-model='newFolderName', v-on:keyup.enter="newFolderCreate", v-on:keyup.esc="newFolderDiscard")
-								span.help.is-danger.is-hidden This folder name is invalid!
+								span.help.is-danger(v-show="newFolderError") This folder name is invalid!
 					footer.card-footer
 						a.card-footer-item(v-on:click="newFolderDiscard") Discard
 						a.card-footer-item(v-on:click="newFolderCreate") Create

ws-server.js

@@ -5,22 +5,14 @@
 // ===========================================
 
 global.ROOTPATH = __dirname;
+global.PROCNAME = 'WS';
 
 // ----------------------------------------
 // Load Winston
 // ----------------------------------------
 
 var _isDebug = process.env.NODE_ENV === 'development';
-
+global.winston = require('./lib/winston')(_isDebug);
-global.winston = require('winston');
-winston.remove(winston.transports.Console)
-winston.add(winston.transports.Console, {
-	level: (_isDebug) ? 'info' : 'warn',
-	prettyPrint: true,
-	colorize: true,
-	silent: false,
-	timestamp: true
-});
 
 // ----------------------------------------
 // Fetch internal handshake key
@@ -141,6 +133,12 @@ io.on('connection', (socket) => {
 		cb(lcdata.getUploadsFolders());
 	});
 
+	socket.on('uploadsCreateFolder', (data, cb) => {
+		lcdata.createUploadsFolder(data.foldername).then((fldList) => {
+			cb(fldList);
+		});
+	});
+
 	socket.on('uploadsSetFiles', (data, cb) => {
 		if(internalAuth.validateKey(data.auth)) {
 			lcdata.setUploadsFiles(data.content);