diff --git a/controllers/pages.js b/controllers/pages.js index d52a711d..8c8a354b 100644 --- a/controllers/pages.js +++ b/controllers/pages.js @@ -30,7 +30,6 @@ router.get('/logout', isLoggedIn, (req, res, next) => { //remove session req.session.destroy(); - return res.render('message', { 'title': 'Success', 'message': 'You have been logged out successfully', diff --git a/db-models/bans.js b/db-models/bans.js index c4d58fb2..80163324 100644 --- a/db-models/bans.js +++ b/db-models/bans.js @@ -16,6 +16,12 @@ module.exports = { }).toArray(); }, + getBoardBans: (board) => { + return db.find({ + 'board': board, + }).toArray(); + }, + insertOne: (ban) => { return db.insertOne(ban); }, diff --git a/models/forms/ban-poster.js b/models/forms/ban-poster.js index 16eb2554..2893d406 100644 --- a/models/forms/ban-poster.js +++ b/models/forms/ban-poster.js @@ -26,7 +26,7 @@ module.exports = async (req, res, next, board, checkedPosts) => { 'ip': post.ip, 'reason': req.body.reason || 'No reason specified', 'board': board, - 'post': req.body.delete ? null : post, + 'post': req.body.preserve_post ? post : null, 'issuer': req.session.user.username, 'date': new Date(), 'expireAt': new Date((new Date).getTime() + (72*1000*60*60)) // 72h ban diff --git a/models/forms/register.js b/models/forms/register.js index 6a576c8c..ef79e9fd 100644 --- a/models/forms/register.js +++ b/models/forms/register.js @@ -31,10 +31,6 @@ module.exports = async (req, res, next) => { return next(err); } - return res.render('message', { - 'title': 'Success', - 'message': `Welcome, ${username}`, - 'redirect': '/' - }); + return res.redirect('/login') } diff --git a/models/pages/manage.js b/models/pages/manage.js index a981b79c..1ef2ec91 100644 --- a/models/pages/manage.js +++ b/models/pages/manage.js @@ -1,12 +1,15 @@ 'use strict'; -const Posts = require(__dirname+'/../../db-models/posts.js'); +const Posts = require(__dirname+'/../../db-models/posts.js') + , Bans = require(__dirname+'/../../db-models/bans.js'); module.exports = async (req, res, next) => { let posts; + let bans; try { posts = await Posts.getReports(req.params.board); + bans = await Bans.getBoardBans(req.params.board); } catch (err) { return next(err) } @@ -14,7 +17,8 @@ module.exports = async (req, res, next) => { //render the page res.render('manage', { csrf: req.csrfToken(), - posts: posts + posts: posts, + bans: bans || [], }); } diff --git a/server.js b/server.js index 8773f802..be89365c 100644 --- a/server.js +++ b/server.js @@ -53,7 +53,7 @@ const express = require('express') // use pug view engine app.set('view engine', 'pug'); app.set('views', path.join(__dirname, 'views/pages')); -// app.enable('view cache'); + app.enable('view cache'); // static files app.use('/css', express.static(__dirname + '/static/css')); diff --git a/static/css/style.css b/static/css/style.css index 5a6d4c3d..5160b871 100644 --- a/static/css/style.css +++ b/static/css/style.css @@ -13,6 +13,12 @@ object { object-fit: scale-down; } +.board-header { + display: flex; + flex-direction: column; + align-items: center; +} + .catalog-tile-button { width: 100%; line-height: 30px; @@ -116,7 +122,7 @@ input, textarea { } .action-wrapper { - align-items: center; + /*align-items: center;*/ /*flex-direction: row;*/ } @@ -177,7 +183,7 @@ input textarea { .board-title { color: #af0a0f; - font: bolder; + font: bolder 28px Tahoma; letter-spacing: -2px; text-align: center; margin: 0; @@ -256,6 +262,10 @@ input textarea { border-right: 1px solid lightgray; } +.right { + float: right; +} + .nav-item:hover { box-shadow: inset 0 0 100px 100px rgba(255,255,255,.1); } @@ -274,7 +284,6 @@ table, th, td { } .boards-table { - font-size: 16pt; margin: 0 auto; } @@ -321,4 +330,8 @@ hr { justify-content: space-evenly; } + .boards-table { + width: 100%; + } + }