Skip to content

W
wiki-js
Commit 4535df89 authored by NGPixel's avatar NGPixel
Browse files
Options

Updated dependencies + fonts optimizations

parent 9caaeee6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 30 deletions
assets/css/app.css
View file @ 4535df89
This source diff could not be displayed because it is too large. You can view the blob instead.
assets/css/error.css
View file @ 4535df89
This source diff could not be displayed because it is too large. You can view the blob instead.
assets/css/login.css
View file @ 4535df89
This source diff could not be displayed because it is too large. You can view the blob instead.
assets/fonts/core-icons.ttf
View file @ 4535df89
This diff was suppressed by a .gitattributes entry.
assets/fonts/core-icons.woff
View file @ 4535df89
This diff was suppressed by a .gitattributes entry.
assets/fonts/fontawesome-webfont.eot deleted 100644 → 0
View file @ 9caaeee6
This diff was suppressed by a .gitattributes entry.
assets/fonts/fontawesome-webfont.svg deleted 100644 → 0
View file @ 9caaeee6
This source diff could not be displayed because it is too large. You can view the blob instead.
assets/fonts/fontawesome-webfont.ttf deleted 100644 → 0
View file @ 9caaeee6
This diff was suppressed by a .gitattributes entry.
assets/fonts/fontawesome-webfont.woff deleted 100644 → 0
View file @ 9caaeee6
This diff was suppressed by a .gitattributes entry.
assets/fonts/fontawesome-webfont.woff2 deleted 100644 → 0
View file @ 9caaeee6
This diff was suppressed by a .gitattributes entry.
assets/js/libs.js
View file @ 4535df89
This source diff could not be displayed because it is too large. You can view the blob instead.
client/js/components/editor.js
View file @ 4535df89
...@@ -26,57 +26,57 @@ if($('#mk-editor').length === 1) { ...@@ -26,57 +26,57 @@ if($('#mk-editor').length === 1) {
toolbar: [{ toolbar: [{
name: "bold", name: "bold",
action: SimpleMDE.toggleBold, action: SimpleMDE.toggleBold,
className: "fa fa-bold", className: "icon-bold",
title: "Bold", title: "Bold",
}, },
{ {
name: "italic", name: "italic",
action: SimpleMDE.toggleItalic, action: SimpleMDE.toggleItalic,
className: "fa fa-italic", className: "icon-italic",
title: "Italic", title: "Italic",
}, },
{ {
name: "strikethrough", name: "strikethrough",
action: SimpleMDE.toggleStrikethrough, action: SimpleMDE.toggleStrikethrough,
className: "fa fa-strikethrough", className: "icon-strikethrough",
title: "Strikethrough", title: "Strikethrough",
}, },
'|', '|',
{ {
name: "heading-1", name: "heading-1",
action: SimpleMDE.toggleHeading1, 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", title: "Big Heading",
}, },
{ {
name: "heading-2", name: "heading-2",
action: SimpleMDE.toggleHeading2, 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", title: "Medium Heading",
}, },
{ {
name: "heading-3", name: "heading-3",
action: SimpleMDE.toggleHeading3, 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", title: "Small Heading",
}, },
{ {
name: "quote", name: "quote",
action: SimpleMDE.toggleBlockquote, action: SimpleMDE.toggleBlockquote,
className: "fa fa-quote-left", className: "icon-quote-left",
title: "Quote", title: "Quote",
}, },
'|', '|',
{ {
name: "unordered-list", name: "unordered-list",
action: SimpleMDE.toggleUnorderedList, action: SimpleMDE.toggleUnorderedList,
className: "fa fa-list-ul", className: "icon-list-ul",
title: "Bullet List", title: "Bullet List",
}, },
{ {
name: "ordered-list", name: "ordered-list",
action: SimpleMDE.toggleOrderedList, action: SimpleMDE.toggleOrderedList,
className: "fa fa-list-ol", className: "icon-list-ol",
title: "Numbered List", title: "Numbered List",
}, },
'|', '|',
...@@ -88,7 +88,7 @@ if($('#mk-editor').length === 1) { ...@@ -88,7 +88,7 @@ if($('#mk-editor').length === 1) {
$('#modal-editor-link').slideToggle(); $('#modal-editor-link').slideToggle();
}*/ }*/
}, },
className: "fa fa-link", className: "icon-link2",
title: "Insert Link", title: "Insert Link",
}, },
{ {
...@@ -98,7 +98,7 @@ if($('#mk-editor').length === 1) { ...@@ -98,7 +98,7 @@ if($('#mk-editor').length === 1) {
vueImage.open(); vueImage.open();
} }
}, },
className: "fa fa-image", className: "icon-image3",
title: "Insert Image", title: "Insert Image",
}, },
{ {
...@@ -108,9 +108,19 @@ if($('#mk-editor').length === 1) { ...@@ -108,9 +108,19 @@ if($('#mk-editor').length === 1) {
vueFile.open(); vueFile.open();
} }
}, },
className: "fa fa-file-text-o", className: "icon-file-text-o",
title: "Insert File", title: "Insert File",
}, },
{
name: "video",
action: (editor) => {
/*if(!mdeModalOpenState) {
vueFile.open();
}*/
},
className: "icon-video-camera2",
title: "Insert Video Player",
},
'|', '|',
{ {
name: "inline-code", name: "inline-code",
...@@ -126,7 +136,7 @@ if($('#mk-editor').length === 1) { ...@@ -126,7 +136,7 @@ if($('#mk-editor').length === 1) {
editor.codemirror.doc.replaceSelections(curSel); editor.codemirror.doc.replaceSelections(curSel);
}, },
className: "fa fa-terminal", className: "icon-terminal",
title: "Inline Code", title: "Inline Code",
}, },
{ {
...@@ -143,7 +153,7 @@ if($('#mk-editor').length === 1) { ...@@ -143,7 +153,7 @@ if($('#mk-editor').length === 1) {
} }
}, },
className: "fa fa-code", className: "icon-code",
title: "Code Block", title: "Code Block",
}, },
'|', '|',
...@@ -152,13 +162,13 @@ if($('#mk-editor').length === 1) { ...@@ -152,13 +162,13 @@ if($('#mk-editor').length === 1) {
action: (editor) => { action: (editor) => {
//todo //todo
}, },
className: "fa fa-table", className: "icon-table",
title: "Insert Table", title: "Insert Table",
}, },
{ {
name: "horizontal-rule", name: "horizontal-rule",
action: SimpleMDE.drawHorizontalRule, action: SimpleMDE.drawHorizontalRule,
className: "fa fa-minus", className: "icon-minus2",
title: "Horizontal Rule", title: "Horizontal Rule",
} }
], ],
......
controllers/pages.js
View file @ 4535df89
...@@ -137,10 +137,11 @@ router.get('/source/*', (req, res, next) => { ...@@ -137,10 +137,11 @@ router.get('/source/*', (req, res, next) => {
cache: false cache: false
}).then((pageData) => { }).then((pageData) => {
if(pageData) { if(pageData) {
return res.render('pages/source', { pageData }); res.render('pages/source', { pageData });
} else { } else {
throw new Error('Invalid page path.'); throw new Error('Invalid page path.');
} }
return true;
}).catch((err) => { }).catch((err) => {
res.render('error', { res.render('error', {
message: err.message, message: err.message,
......
gulpfile.js
View file @ 4535df89
...@@ -51,7 +51,6 @@ var paths = { ...@@ -51,7 +51,6 @@ var paths = {
}, },
css: { css: {
combine: [ combine: [
'./node_modules/font-awesome/css/font-awesome.min.css',
'./node_modules/highlight.js/styles/tomorrow.css', './node_modules/highlight.js/styles/tomorrow.css',
'./node_modules/simplemde/dist/simplemde.min.css' './node_modules/simplemde/dist/simplemde.min.css'
], ],
...@@ -67,8 +66,6 @@ var paths = { ...@@ -67,8 +66,6 @@ var paths = {
] ]
}, },
fonts: [ fonts: [
'./node_modules/font-awesome/fonts/*-webfont.*',
'!./node_modules/font-awesome/fonts/*-webfont.svg',
'../node_modules/requarks-core/core-client/fonts/**/*' //! MUST BE LAST '../node_modules/requarks-core/core-client/fonts/**/*' //! MUST BE LAST
], ],
deploy: [ deploy: [
......
package.json
View file @ 4535df89
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
"dependencies": { "dependencies": {
"auto-load": "^2.1.0", "auto-load": "^2.1.0",
"bcryptjs-then": "^1.0.1", "bcryptjs-then": "^1.0.1",
"bluebird": "^3.4.6", "bluebird": "^3.4.7",
"body-parser": "^1.15.2", "body-parser": "^1.15.2",
"cheerio": "^0.22.0", "cheerio": "^0.22.0",
"child-process-promise": "^2.2.0", "child-process-promise": "^2.2.0",
...@@ -49,16 +49,16 @@ ...@@ -49,16 +49,16 @@
"express-brute-mongoose": "0.0.7", "express-brute-mongoose": "0.0.7",
"express-session": "^1.14.2", "express-session": "^1.14.2",
"farmhash": "^1.2.1", "farmhash": "^1.2.1",
"file-type": "^3.8.0", "file-type": "^4.0.0",
"filesize.js": "^1.0.2", "filesize.js": "^1.0.2",
"fs-extra": "^1.0.0", "fs-extra": "^1.0.0",
"git-wrapper2-promise": "^0.2.9", "git-wrapper2-promise": "^0.2.9",
"highlight.js": "^9.9.0", "highlight.js": "^9.9.0",
"i18next": "^4.1.1", "i18next": "^4.1.4",
"i18next-express-middleware": "^1.0.2", "i18next-express-middleware": "^1.0.2",
"i18next-node-fs-backend": "^0.1.3", "i18next-node-fs-backend": "^0.1.3",
"js-yaml": "^3.7.0", "js-yaml": "^3.7.0",
"lodash": "^4.17.2", "lodash": "^4.17.3",
"markdown-it": "^8.2.2", "markdown-it": "^8.2.2",
"markdown-it-abbr": "^1.0.4", "markdown-it-abbr": "^1.0.4",
"markdown-it-anchor": "^2.6.0", "markdown-it-anchor": "^2.6.0",
...@@ -70,8 +70,8 @@ ...@@ -70,8 +70,8 @@
"markdown-it-task-lists": "^1.4.1", "markdown-it-task-lists": "^1.4.1",
"mime-types": "^2.1.13", "mime-types": "^2.1.13",
"moment": "^2.17.1", "moment": "^2.17.1",
"moment-timezone": "^0.5.10", "moment-timezone": "^0.5.11",
"mongoose": "^4.7.3", "mongoose": "^4.7.5",
"multer": "^1.2.1", "multer": "^1.2.1",
"passport": "^0.3.2", "passport": "^0.3.2",
"passport-facebook": "^2.1.1", "passport-facebook": "^2.1.1",
...@@ -84,9 +84,9 @@ ...@@ -84,9 +84,9 @@
"remove-markdown": "^0.1.0", "remove-markdown": "^0.1.0",
"requarks-core": "github:requarks/core", "requarks-core": "github:requarks/core",
"request": "^2.79.0", "request": "^2.79.0",
"search-index": "^0.9.6", "search-index": "^0.9.9",
"serve-favicon": "^2.3.2", "serve-favicon": "^2.3.2",
"sharp": "^0.16.1", "sharp": "^0.17.0",
"simplemde": "^1.11.2", "simplemde": "^1.11.2",
"socket.io": "^1.7.2", "socket.io": "^1.7.2",
"sticky-js": "^1.0.7", "sticky-js": "^1.0.7",
...@@ -100,7 +100,6 @@ ...@@ -100,7 +100,6 @@
"chai": "^3.5.0", "chai": "^3.5.0",
"chai-as-promised": "^6.0.0", "chai-as-promised": "^6.0.0",
"codacy-coverage": "^2.0.0", "codacy-coverage": "^2.0.0",
"font-awesome": "^4.6.3",
"gulp": "^3.9.1", "gulp": "^3.9.1",
"gulp-babel": "^6.1.2", "gulp-babel": "^6.1.2",
"gulp-clean-css": "^2.3.2", "gulp-clean-css": "^2.3.2",
...@@ -127,7 +126,7 @@ ...@@ -127,7 +126,7 @@
"snyk": "^1.22.1", "snyk": "^1.22.1",
"sticky-js": "^1.1.6", "sticky-js": "^1.1.6",
"twemoji-awesome": "^1.0.4", "twemoji-awesome": "^1.0.4",
"vue": "^2.1.6" "vue": "^2.1.7"
}, },
"snyk": true "snyk": true
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment