Updated dependencies + fonts optimizations

client/js/components/editor.js

@@ -26,57 +26,57 @@ if($('#mk-editor').length === 1) {
 		toolbar: [{
 				name: "bold",
 				action: SimpleMDE.toggleBold,
-				className: "fa fa-bold",
+				className: "icon-bold",
 				title: "Bold",
 			},
 			{
 				name: "italic",
 				action: SimpleMDE.toggleItalic,
-				className: "fa fa-italic",
+				className: "icon-italic",
 				title: "Italic",
 			},
 			{
 				name: "strikethrough",
 				action: SimpleMDE.toggleStrikethrough,
-				className: "fa fa-strikethrough",
+				className: "icon-strikethrough",
 				title: "Strikethrough",
 			},
 			'|',
 			{
 				name: "heading-1",
 				action: SimpleMDE.toggleHeading1,
-				className: "fa fa-header fa-header-x fa-header-1",
+				className: "icon-header fa-header-x fa-header-1",
 				title: "Big Heading",
 			},
 			{
 				name: "heading-2",
 				action: SimpleMDE.toggleHeading2,
-				className: "fa fa-header fa-header-x fa-header-2",
+				className: "icon-header fa-header-x fa-header-2",
 				title: "Medium Heading",
 			},
 			{
 				name: "heading-3",
 				action: SimpleMDE.toggleHeading3,
-				className: "fa fa-header fa-header-x fa-header-3",
+				className: "icon-header fa-header-x fa-header-3",
 				title: "Small Heading",
 			},
 			{
 				name: "quote",
 				action: SimpleMDE.toggleBlockquote,
-				className: "fa fa-quote-left",
+				className: "icon-quote-left",
 				title: "Quote",
 			},
 			'|',
 			{
 				name: "unordered-list",
 				action: SimpleMDE.toggleUnorderedList,
-				className: "fa fa-list-ul",
+				className: "icon-list-ul",
 				title: "Bullet List",
 			},
 			{
 				name: "ordered-list",
 				action: SimpleMDE.toggleOrderedList,
-				className: "fa fa-list-ol",
+				className: "icon-list-ol",
 				title: "Numbered List",
 			},
 			'|',
@@ -88,7 +88,7 @@ if($('#mk-editor').length === 1) {
 						$('#modal-editor-link').slideToggle();
 					}*/
 				},
-				className: "fa fa-link",
+				className: "icon-link2",
 				title: "Insert Link",
 			},
 			{
@@ -98,7 +98,7 @@ if($('#mk-editor').length === 1) {
 						vueImage.open();
 					}
 				},
-				className: "fa fa-image",
+				className: "icon-image3",
 				title: "Insert Image",
 			},
 			{
@@ -108,9 +108,19 @@ if($('#mk-editor').length === 1) {
 						vueFile.open();
 					}
 				},
-				className: "fa fa-file-text-o",
+				className: "icon-file-text-o",
 				title: "Insert File",
 			},
+			{
+				name: "video",
+				action: (editor) => {
+					/*if(!mdeModalOpenState) {
+						vueFile.open();
+					}*/
+				},
+				className: "icon-video-camera2",
+				title: "Insert Video Player",
+			},
 			'|',
 			{
 				name: "inline-code",
@@ -126,7 +136,7 @@ if($('#mk-editor').length === 1) {
 					editor.codemirror.doc.replaceSelections(curSel);
 
 				},
-				className: "fa fa-terminal",
+				className: "icon-terminal",
 				title: "Inline Code",
 			},
 			{
@@ -143,7 +153,7 @@ if($('#mk-editor').length === 1) {
 
 					}
 				},
-				className: "fa fa-code",
+				className: "icon-code",
 				title: "Code Block",
 			},
 			'|',
@@ -152,13 +162,13 @@ if($('#mk-editor').length === 1) {
 				action: (editor) => {
 					//todo
 				},
-				className: "fa fa-table",
+				className: "icon-table",
 				title: "Insert Table",
 			},
 			{
 				name: "horizontal-rule",
 				action: SimpleMDE.drawHorizontalRule,
-				className: "fa fa-minus",
+				className: "icon-minus2",
 				title: "Horizontal Rule",
 			}
 		],

controllers/pages.js

@@ -137,10 +137,11 @@ router.get('/source/*', (req, res, next) => {
 		cache: false
 	}).then((pageData) => {
 		if(pageData) {
-			return res.render('pages/source', { pageData });
+			res.render('pages/source', { pageData });
 		} else {
 			throw new Error('Invalid page path.');
 		}
+		return true;
 	}).catch((err) => {
 		res.render('error', {
 			message: err.message,

gulpfile.js

@@ -51,7 +51,6 @@ var paths = {
 	},
 	css: {
 		combine: [
-			'./node_modules/font-awesome/css/font-awesome.min.css',
 			'./node_modules/highlight.js/styles/tomorrow.css',
 			'./node_modules/simplemde/dist/simplemde.min.css'
 		],
@@ -67,8 +66,6 @@ var paths = {
 		]
 	},
 	fonts: [
-		'./node_modules/font-awesome/fonts/*-webfont.*',
-		'!./node_modules/font-awesome/fonts/*-webfont.svg',
 		'../node_modules/requarks-core/core-client/fonts/**/*' //! MUST BE LAST
 	],
 	deploy: [

package.json

@@ -34,7 +34,7 @@
   "dependencies": {
     "auto-load": "^2.1.0",
     "bcryptjs-then": "^1.0.1",
-    "bluebird": "^3.4.6",
+    "bluebird": "^3.4.7",
     "body-parser": "^1.15.2",
     "cheerio": "^0.22.0",
     "child-process-promise": "^2.2.0",
@@ -49,16 +49,16 @@
     "express-brute-mongoose": "0.0.7",
     "express-session": "^1.14.2",
     "farmhash": "^1.2.1",
-    "file-type": "^3.8.0",
+    "file-type": "^4.0.0",
     "filesize.js": "^1.0.2",
     "fs-extra": "^1.0.0",
     "git-wrapper2-promise": "^0.2.9",
     "highlight.js": "^9.9.0",
-    "i18next": "^4.1.1",
+    "i18next": "^4.1.4",
     "i18next-express-middleware": "^1.0.2",
     "i18next-node-fs-backend": "^0.1.3",
     "js-yaml": "^3.7.0",
-    "lodash": "^4.17.2",
+    "lodash": "^4.17.3",
     "markdown-it": "^8.2.2",
     "markdown-it-abbr": "^1.0.4",
     "markdown-it-anchor": "^2.6.0",
@@ -70,8 +70,8 @@
     "markdown-it-task-lists": "^1.4.1",
     "mime-types": "^2.1.13",
     "moment": "^2.17.1",
-    "moment-timezone": "^0.5.10",
-    "mongoose": "^4.7.3",
+    "moment-timezone": "^0.5.11",
+    "mongoose": "^4.7.5",
     "multer": "^1.2.1",
     "passport": "^0.3.2",
     "passport-facebook": "^2.1.1",
@@ -84,9 +84,9 @@
     "remove-markdown": "^0.1.0",
     "requarks-core": "github:requarks/core",
     "request": "^2.79.0",
-    "search-index": "^0.9.6",
+    "search-index": "^0.9.9",
     "serve-favicon": "^2.3.2",
-    "sharp": "^0.16.1",
+    "sharp": "^0.17.0",
     "simplemde": "^1.11.2",
     "socket.io": "^1.7.2",
     "sticky-js": "^1.0.7",
@@ -100,7 +100,6 @@
     "chai": "^3.5.0",
     "chai-as-promised": "^6.0.0",
     "codacy-coverage": "^2.0.0",
-    "font-awesome": "^4.6.3",
     "gulp": "^3.9.1",
     "gulp-babel": "^6.1.2",
     "gulp-clean-css": "^2.3.2",
@@ -127,7 +126,7 @@
     "snyk": "^1.22.1",
     "sticky-js": "^1.1.6",
     "twemoji-awesome": "^1.0.4",
-    "vue": "^2.1.6"
+    "vue": "^2.1.7"
   },
   "snyk": true
 }