Minor fixes

pull/2/head
Esther 2020-12-19 12:10:19 +00:00
parent 54694085af
commit b8d9455f8c
No known key found for this signature in database
GPG Key ID: 162A307C5EBD40EA
5 changed files with 3159 additions and 346 deletions

2
app.js
View File

@ -26,7 +26,7 @@ if (process.env.NODE_ENV === 'production') {
app.use(mLogger('dev'));
}
app.use(helmet());
//app.use(helmet());
app.use(express.json());
app.use(express.urlencoded({ extended: false }));
app.use(cookieParser());

3456
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -4,23 +4,23 @@
"private": true,
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"start": "npx nodemon ./bin/www"
"start": "npx nodemon ./bin/www -e js,pug"
},
"dependencies": {
"@sendgrid/mail": "^7.2.1",
"@sendgrid/mail": "^7.4.0",
"app-root-path": "^3.0.0",
"axios": "^0.19.2",
"cookie-parser": "1.4.4",
"debug": "4.1.1",
"express": "4.17.1",
"express-rate-limit": "^5.1.3",
"hcaptcha": "0.0.2",
"helmet": "^3.23.3",
"http-errors": "1.7.3",
"morgan": "1.10.0",
"node-sass-middleware": "0.11.0",
"nodemailer": "^6.4.10",
"pug": "3.0.0",
"winston": "^3.3.2"
"axios": "^0.21.0",
"cookie-parser": "^1.4.5",
"debug": "^4.3.1",
"express": "^4.17.1",
"express-rate-limit": "^5.2.3",
"hcaptcha": "^0.0.2",
"helmet": "^4.2.0",
"http-errors": "^1.7.2",
"morgan": "^1.10.0",
"node-sass-middleware": "^0.11.0",
"nodemailer": "^6.4.17",
"pug": "^3.0.0",
"winston": "^3.3.3"
}
}

View File

@ -43,6 +43,7 @@ router.post('/', contact_rate_limit, (req, res) => {
.send(msg)
.then(() => {
res.render('contact', {
title: 'Contact',
message: "I will get back to you soon!",
success: "Make sure the email is from ",
email: REPLY_TO_MAIL
@ -50,17 +51,17 @@ router.post('/', contact_rate_limit, (req, res) => {
})
.catch(error => {
console.log(error)
res.render('error', {message: "Email did not send"})
res.render('error', {title: 'Contact', message: "Email did not send"})
});
} else {
// // rerender with same info in the text box and show error message
res.render('contact', {message: "Captcha failed, try again"});
// rerender with same info in the text box and show error message
res.render('contact', {title: 'Contact', message: "Captcha failed, try again"});
}
})
.catch(error => {
console.log(error);
res.render('contact', {message: "Something wrong happened, try again later"});
res.render('contact', {title: 'Contact', message: "Something wrong happened, try again later"});
});
})

View File

@ -23,7 +23,7 @@ block nav-links
block content
.container-fluid
.row
.col-sm-1
.col-sm-2
.center-v.col-sm-4.aaa.ef
div
h1
@ -54,14 +54,10 @@ block content
svg(class="logo" role='img' viewbox='0 0 24 24' xmlns='http://www.w3.org/2000/svg')
title Ghost icon
path(d='M9.604 19.199H.008V24h9.597v-4.801zm14.39 0h-9.591V24h9.591v-4.801zm.003-9.599H0v4.8h23.997V9.6zM24 0h-4.801v4.801H24V0zm-9.596 0H.008v4.801h14.396V0z')
a(class="logo-container" href="https://matrix.to/#/@blankie:matrix.org" target="_blank")
a(class="logo-container" href="https://matrix.to/#/@blankie:pastel.codes" target="_blank")
svg(class="logo" role='img' viewbox='0 0 24 24' xmlns='http://www.w3.org/2000/svg')
title Matrix icon
path(d='M.632.55v22.9H2.28V24H0V0h2.28v.55zm7.043 7.26v1.157h.033c.309-.443.683-.784 1.117-1.024.433-.245.936-.365 1.5-.365.54 0 1.033.107 1.481.314.448.208.785.582 1.02 1.108.254-.374.6-.706 1.034-.992.434-.287.95-.43 1.546-.43.453 0 .872.056 1.26.167.388.11.716.286.993.53.276.245.489.559.646.951.152.392.23.863.23 1.417v5.728h-2.349V11.52c0-.286-.01-.559-.032-.812a1.755 1.755 0 0 0-.18-.66 1.106 1.106 0 0 0-.438-.448c-.194-.11-.457-.166-.785-.166-.332 0-.6.064-.803.189a1.38 1.38 0 0 0-.48.499 1.946 1.946 0 0 0-.231.696 5.56 5.56 0 0 0-.06.785v4.768h-2.35v-4.8c0-.254-.004-.503-.018-.752a2.074 2.074 0 0 0-.143-.688 1.052 1.052 0 0 0-.415-.503c-.194-.125-.476-.19-.854-.19-.111 0-.259.024-.439.074-.18.051-.36.143-.53.282-.171.138-.319.337-.439.595-.12.259-.18.6-.18 1.02v4.966H5.46V7.81zm15.693 15.64V.55H21.72V0H24v24h-2.28v-.55z')
a(class="logo-container" href="https://hellsite.site/@blankie" target="_blank")
svg(class="logo" role='img' xmlns='http://www.w3.org/2000/svg' viewbox='0 0 24 24')
title Mastodon icon
path(d='M23.193 7.879c0-5.206-3.411-6.732-3.411-6.732C18.062.357 15.108.025 12.041 0h-.076c-3.068.025-6.02.357-7.74 1.147 0 0-3.411 1.526-3.411 6.732 0 1.192-.023 2.618.015 4.129.124 5.092.934 10.109 5.641 11.355 2.17.574 4.034.695 5.535.612 2.722-.15 4.25-.972 4.25-.972l-.09-1.975s-1.945.613-4.129.539c-2.165-.074-4.449-.233-4.799-2.891a5.499 5.499 0 0 1-.048-.745s2.125.52 4.817.643c1.646.075 3.19-.097 4.758-.283 3.007-.359 5.625-2.212 5.954-3.905.517-2.665.475-6.507.475-6.507zm-4.024 6.709h-2.497V8.469c0-1.29-.543-1.944-1.628-1.944-1.2 0-1.802.776-1.802 2.312v3.349h-2.483v-3.35c0-1.536-.602-2.312-1.802-2.312-1.085 0-1.628.655-1.628 1.944v6.119H4.832V8.284c0-1.289.328-2.313.987-3.07.68-.758 1.569-1.146 2.674-1.146 1.278 0 2.246.491 2.886 1.474L12 6.585l.622-1.043c.64-.983 1.608-1.474 2.886-1.474 1.104 0 1.994.388 2.674 1.146.658.757.986 1.781.986 3.07v6.304z')
a(class="logo-container" href="https://twitter.com/ErrorFacade" target="_blank")
svg(class="logo" role='img' viewbox='0 0 24 24' xmlns='http://www.w3.org/2000/svg')
title Twitter icon