From 0e9c7d9086544285a68a39f47f571d68428aa512 Mon Sep 17 00:00:00 2001 From: Song Date: Sun, 17 Jan 2021 15:18:55 +0800 Subject: [PATCH] :construction: save work --- app.js | 2 ++ config.js | 1 + middlewares/web_auth.js | 38 +++++++++++++++++++++++++++ public/main.css | 54 +++++++++++++++++++------------------- routers/index.js | 25 +++++++++++++----- views/index.ejs | 17 +++++++----- views/login.ejs | 8 +----- views/message.ejs | 9 +------ views/partials/message.ejs | 12 +++++++++ views/partials/nav.ejs | 2 +- views/register.ejs | 1 + 11 files changed, 113 insertions(+), 56 deletions(-) create mode 100644 views/partials/message.ejs diff --git a/app.js b/app.js index 353b198..9a2ba9b 100644 --- a/app.js +++ b/app.js @@ -19,6 +19,8 @@ const app = express(); app.locals.isLogged = false; app.locals.isAdmin = false; +app.locals.message = ''; +app.locals.isErrorMessage = false; setTimeout(async () => { // TODO: Here we need an improvement! I have tried EventEmitter but it's not working. :( diff --git a/config.js b/config.js index 40f3b8d..071eb83 100644 --- a/config.js +++ b/config.js @@ -1,4 +1,5 @@ const config = { + allowRegister: true, port: process.env.PORT || 3000, database: 'data.db', href: 'https://github.com/', diff --git a/middlewares/web_auth.js b/middlewares/web_auth.js index e69de29..077a75e 100644 --- a/middlewares/web_auth.js +++ b/middlewares/web_auth.js @@ -0,0 +1,38 @@ +const config = require('../config'); + +exports.userRequired = (req, res, next) => { + if (req.session.user) { + if (req.session.user.isBlocked) { + return res.render('message', { + isError: true, + message: '用户账户被禁用，请联系管理员', + link: '/feedback', + }); + } + } else { + return res.render('message', { + isError: false, + message: '用户尚未登录，请登录', + link: '/login', + }); + } + next(); +}; + +exports.adminRequired = (req, res, next) => { + if (!req.session.user || !req.session.user.isAdmin) { + return res.render('message', { + isError: true, + message: '需要超级管理员权限', + }); + } + next(); +}; + +exports.allowRegister = (req, res, next) => { + if (!config.allowRegister) { + req.flash('message', '管理员未开放注册！'); + return res.redirect('/'); + } + next(); +}; diff --git a/public/main.css b/public/main.css index d6c5645..a014443 100644 --- a/public/main.css +++ b/public/main.css @@ -70,7 +70,7 @@ code { box-shadow: 0 2px 3px rgba(26,26,26,.1); } -.box article { +.box .article { overflow-wrap: break-word; font-size: larger; word-break: break-word; @@ -105,21 +105,21 @@ img { font-size: larger; } -article a { +.article a { color: #368CCB; text-decoration: none; } -article a:hover { +.article a:hover { color: #368CCB; text-decoration: none; } -article h2, -article h3, -article h4, -article h5, -article h6 { +.article h2, +.article h3, +.article h4, +.article h5, +.article h6 { font-weight: 700; line-height: 1.5; margin: 20px 0 15px; @@ -127,54 +127,54 @@ article h6 { margin-block-end: 0.2em; } -article h1 { +.article h1 { font-size: 1.7em } -article h2 { +.article h2 { font-size: 1.6em } -article h3 { +.article h3 { font-size: 1.45em } -article h4 { +.article h4 { font-size: 1.25em; } -article h5 { +.article h5 { font-size: 1.1em; } -article h6 { +.article h6 { font-size: 1em; font-weight: bold } @media screen and (max-width: 960px) { - article h1 { + .article h1 { font-size: 1.5em } - article h2 { + .article h2 { font-size: 1.35em } - article h3 { + .article h3 { font-size: 1.3em } - article h4 { + .article h4 { font-size: 1.2em; } } -article p { +.article p { margin-top: 0; margin-bottom: 1.25rem; } -article table { +.article table { margin: auto; border-collapse: collapse; border-spacing: 0; @@ -183,20 +183,20 @@ article table { min-width: 66%; } -article table td, -article table th { +.article table td, +.article table th { padding: 5px 8px; border: 1px solid #bbb; } -article blockquote { +.article blockquote { margin-left: 0; padding: 0 1em; font-size: smaller; border-left: 5px solid #ddd; } -article pre { +.article pre { overflow-x: auto; padding: 0; font-size: 16px; @@ -204,18 +204,18 @@ article pre { margin-bottom: 12px; } -article ol { +.article ol { text-decoration: none; padding-inline-start: 40px; margin-bottom: 1.25rem; } -article code { +.article code { color: #bc9458; padding: .065em .4em; } -article .copyright{ +.article .copyright{ display: none; } diff --git a/routers/index.js b/routers/index.js index 5a09110..62af439 100644 --- a/routers/index.js +++ b/routers/index.js @@ -2,17 +2,17 @@ const express = require('express'); const router = express.Router(); const { User } = require('../models'); const { tokenStore } = require('../common/token'); +const { allowRegister } = require('../middlewares/web_auth'); +const config = require('../config'); router.get('/', (req, res, next) => { res.render('index', { - message: '', + message: req.flash('message'), }); }); router.get('/login', (req, res, next) => { - res.render('login', { - message: '', - }); + res.render('login'); }); router.post('/login', async (req, res, next) => { @@ -21,10 +21,17 @@ router.post('/login', async (req, res, next) => { password: req.body.password, }; let message = ''; + res.locals.isErrorMessage = true; try { user = await User.findOne({ where: user }); if (user) { req.session.user = user; + req.flash( + 'message', + `欢迎${user.isAdmin ? '管理员' : '普通'}用户 ${ + user.username + } 登陆系统！` + ); return res.redirect('/'); } else { message = '用户名或密码错误'; @@ -38,11 +45,17 @@ router.post('/login', async (req, res, next) => { }); }); -router.get('/register', (req, res, next) => { +router.get('/logout', (req, res, next) => { + req.session.user = undefined; + req.flash('message', '已退出登录'); + res.redirect('/'); +}); + +router.get('/register', allowRegister, (req, res, next) => { res.render('register'); }); -router.post('/register', async (req, res, next) => { +router.post('/register', allowRegister, async (req, res, next) => { let user = { username: req.body.username, password: req.body.password, diff --git a/views/index.ejs b/views/index.ejs index 55511f4..cf34cdd 100644 --- a/views/index.ejs +++ b/views/index.ejs @@ -1,12 +1,15 @@ <%- include('./partials/header') %> -
-
-
- +
+ <%- include('./partials/message') %> +
+
+

系统状况

- -
-
+
+ 内存占用: <%= (process.memoryUsage().rss / (1024 *1024)).toFixed(2) %> MB +
+
+ <%- include('./partials/footer') %> diff --git a/views/login.ejs b/views/login.ejs index d2a5249..d4d5555 100644 --- a/views/login.ejs +++ b/views/login.ejs @@ -3,13 +3,7 @@

用户登录

- <% if(message) { %> -
-
- <%= message %> -
-
- <% }%> + <%- include('./partials/message') %>
diff --git a/views/message.ejs b/views/message.ejs index d615e18..863f59e 100644 --- a/views/message.ejs +++ b/views/message.ejs @@ -1,10 +1,3 @@ <%- include('./partials/header') %> -
-
-

<%= title %>

-
-
- <%= message %> -
-
+<%- include('./partials/message') %> <%- include('./partials/footer') %> diff --git a/views/partials/message.ejs b/views/partials/message.ejs new file mode 100644 index 0000000..be13de8 --- /dev/null +++ b/views/partials/message.ejs @@ -0,0 +1,12 @@ +<% if(message && message.length) { %> +
+
+ <%= message %> +
+ +
+<% }%> \ No newline at end of file diff --git a/views/partials/nav.ejs b/views/partials/nav.ejs index 194ed88..8337da2 100644 --- a/views/partials/nav.ejs +++ b/views/partials/nav.ejs @@ -15,7 +15,7 @@