theluyuan/iblog2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复了一些bug

Browse Source
This commit is contained in:
eshengsky
2019-01-24 12:48:12 +08:00
parent c892170b35
commit 7ce30a87f9
7 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app.js
View File

@@ -90,7 +90,7 @@ app.use('/admin', require('connect-ensure-login')
// 捕获 404
app.use((req, res) => {
const err = new Error('Not Found!');
const err = new Error(`Not Found! URL: ${req.originalUrl}`);
err.status = 404;
logger.errLogger(err, req);
res.status(404)

10
package-lock.json generated
View File

@@ -1326,9 +1326,9 @@
}
},
"bootstrap": {
"version": "3.3.7",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz",
"integrity": "sha1-WjiTlFSfIzMIdaOxUGVldPip63E="
"version": "3.4.0",
"resolved": "https://registry.npmjs.org/bootstrap/-/bootstrap-3.4.0.tgz",
"integrity": "sha512-F1yTDO9OHKH0xjl03DsOe8Nu1OWBIeAugGMhy3UTIYDdbbIPesQIhCEbj+HEr6wqlwweGAlP8F3OBC6kEuhFuw=="
},
"boxen": {
"version": "1.3.0",
@@ -4743,7 +4743,7 @@
"integrity": "sha1-SoWtZYgfYoV/xwr3F0oRhNzM4ys="
},
"highlight.js": {
"version": "git+https://github.com/highlightjs/highlight.js.git#b0318d74d5bf65ad19456337c21e7d7bd6cefe7d"
"version": "git+https://github.com/highlightjs/highlight.js.git#4e7ad8d679a40742e690058ce691298b807caad0"
},
"homedir-polyfill": {
"version": "1.0.1",
@@ -7417,7 +7417,7 @@
}
},
"scrollnav": {
"version": "git+https://github.com/jimmynotjim/scrollNav.git#a5d215d6786e1651a2f2336942c3d5b8396490b7"
"version": "git+https://github.com/jimmynotjim/scrollNav.git#0829b85cbc1351cdb7d5f0dd68b66638d2e057a4"
},
"semver": {
"version": "5.5.0",

4
package.json
View File

@@ -13,7 +13,7 @@
"animate.css": "^3.6.1",
"blueimp-file-upload": "^9.22.0",
"body-parser": "~1.13.2",
"bootstrap": "^3.3.7",
"bootstrap": "^3.4.0",
"codemirror": "^5.39.0",
"connect-ensure-login": "^0.1.1",
"cookie-parser": "~1.3.5",
@@ -41,7 +41,7 @@
"passport-local": "^1.0.0",
"pug": "^2.0.3",
"redis": "^2.4.2",
"scrollnav": "git+https://github.com/jimmynotjim/scrollNav.git",
"scrollnav": "git+https://github.com/jimmynotjim/scrollNav.git#v2.7.3",
"semver": "^5.5.0",
"serve-favicon": "~2.3.0",
"shortid": "^2.2.4",

2
public/libs/ueditor/dialogs/insertalert/insertalert.html
View File

@@ -4,7 +4,7 @@
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script type="text/javascript" src="../internal.js"></script>
<link href="/static/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
<link href="/nodeModules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
<style>
body {
font-family: "微软雅黑";

2
public/libs/ueditor/dialogs/insertlabel/insertlabel.html
View File

@@ -4,7 +4,7 @@
<title></title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<script type="text/javascript" src="../internal.js"></script>
<link href="/static/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
<link href="/nodeModules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" />
<style>
body {
font-family: "微软雅黑";

6
public/libs/ueditor/ueditor.config.js
View File

@@ -87,9 +87,9 @@
//给编辑器内部引入css文件
,
iframeCssUrl: '/static/bootstrap/dist/css/bootstrap.min.css'
+ '#/static/css/site.css'
+ '#/static/@fortawesome/fontawesome-free/css/all.min.css'
iframeCssUrl: '/nodeModules/bootstrap/dist/css/bootstrap.min.css'
+ '#/static/dist/css/site.css'
+ '#/nodeModules/@fortawesome/fontawesome-free/css/all.min.css'
//indentValue
//首行缩进距离,默认是2em

12
views/blog/article.pug
View File

@@ -6,10 +6,10 @@ block content
link(href=`${staticPrefix}/css/posts_style_custom.css`, rel='stylesheet')
if (post.ContentType === 'markdown')
link(href=`${staticPrefix}/css/github-markdown.css', rel='stylesheet')
if (settings.CodeTheme==='Monokai')
link(href=`${staticPrefix}/css/monokai-sublime.css', rel='stylesheet')
link(href=`${staticPrefix}/css/dark_theme_code.css', rel='stylesheet')
link(href=`${staticPrefix}/css/github-markdown.css`, rel='stylesheet')
if (settings.CodeTheme === 'Monokai')
link(href=`${staticPrefix}/css/monokai-sublime.css`, rel='stylesheet')
link(href=`${staticPrefix}/css/dark_theme_code.css`, rel='stylesheet')
.detail-container
.container
.row
@@ -91,7 +91,7 @@ block content
script(type='text/javascript', src='/nodeModules/jquery/dist/jquery.min.js', charset='utf-8')
script(type='text/javascript', src='/nodeModules/bootstrap/dist/js/bootstrap.min.js', charset='utf-8')
script(type='text/javascript', src='/nodeModules/lightbox2/dist/js/lightbox.min.js', charset='utf-8')
script(type='text/javascript', src='/nodeModules/scrollNav/dist/jquery.scrollNav.min.js', charset='utf-8')
script(type='text/javascript', src='/nodeModules/scrollnav/dist/jquery.scrollNav.min.js', charset='utf-8')
script(type='text/javascript', src='https://cdn.bootcss.com/highlight.js/9.12.0/highlight.min.js', charset='utf-8')
script(type='text/javascript', src=`${staticPrefix}/js/article.js`, charset='utf-8')
script(type='text/javascript', src=`${staticPrefix}/js/highlight_line_number.js`, charset='utf-8')
@@ -105,6 +105,6 @@ block content
summary: "#{post.Summary}",
title: "#{post.Title}"
};
script(type = 'text/javascript', src = 'http://v3.jiathis.com/code/jia.js?uid=#{settings.JiaThisId}', charset = 'utf-8')
script(type = 'text/javascript', src = `http://v3.jiathis.com/code/jia.js?uid=${settings.JiaThisId}`, charset = 'utf-8')
script(type='text/javascript', src='/nodeModules/jquery-qrcode/dist/jquery-qrcode.min.js', charset='utf-8')
script(type = 'text/javascript', src = `${staticPrefix}/js/top.js`, charset = 'utf-8')