Merge pull request #6 from blankie404/fix

Fix
This commit is contained in:
E 2021-05-21 17:21:23 +01:00 committed by GitHub
commit 66585f8b78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 144 additions and 3210 deletions

4
app.js
View File

@ -3,7 +3,7 @@ var express = require('express');
var path = require('path'); var path = require('path');
var cookieParser = require('cookie-parser'); var cookieParser = require('cookie-parser');
var mLogger = require('morgan'); var mLogger = require('morgan');
var sass = require('node-sass'); var sassMiddleware = require('node-sass-middleware');
var logger = require('./config/winston'); var logger = require('./config/winston');
const helmet = require("helmet"); const helmet = require("helmet");
@ -45,7 +45,7 @@ app.use(
app.use(express.json()); app.use(express.json());
app.use(express.urlencoded({ extended: false })); app.use(express.urlencoded({ extended: false }));
app.use(cookieParser()); app.use(cookieParser());
app.use(sass.middleware({ app.use(sassMiddleware({
src: path.join(__dirname, 'public'), src: path.join(__dirname, 'public'),
dest: path.join(__dirname, 'public'), dest: path.join(__dirname, 'public'),
indentedSyntax: true, // true = .sass and false = .scss indentedSyntax: true, // true = .sass and false = .scss

3344
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -18,7 +18,7 @@
"helmet": "^4.6.0", "helmet": "^4.6.0",
"http-errors": "^1.8.0", "http-errors": "^1.8.0",
"morgan": "^1.10.0", "morgan": "^1.10.0",
"node-sass": "^6.0.0", "node-sass-middleware": "^0.11.0",
"nodemailer": "^6.6.0", "nodemailer": "^6.6.0",
"pug": "^3.0.2", "pug": "^3.0.2",
"winston": "^3.3.3" "winston": "^3.3.3"

View File

@ -4,7 +4,7 @@ html
meta(http-equiv="content-type" content="text/html; charset=UTF-8") meta(http-equiv="content-type" content="text/html; charset=UTF-8")
meta(name="viewport" content="width=device-width, initial-scale=1") meta(name="viewport" content="width=device-width, initial-scale=1")
title ESTR. // #{title} title EEEE. // #{title}
meta(name="description" content=description) meta(name="description" content=description)
link(rel='icon' type='image/png' sizes='32x32' href='/images/favicon-32x32.png') link(rel='icon' type='image/png' sizes='32x32' href='/images/favicon-32x32.png')
@ -42,7 +42,7 @@ html
p © 2020 | p © 2020 |
| |
| |
a(href="/") ESTR. a(href="/") EEEE.
script(src="/javascript/jquery-3.5.1.min.js") script(src="/javascript/jquery-3.5.1.min.js")
script(src="/javascript/bootstrap.js") script(src="/javascript/bootstrap.js")