From e8e565605f336cf46a125c671c4753479be59095 Mon Sep 17 00:00:00 2001 From: Cadence Fish Date: Wed, 29 Jan 2020 01:17:32 +1300 Subject: [PATCH] Fix #15 --- src/site/api/routes.js | 8 +++++--- src/site/pug/friendlyerror.pug | 2 ++ src/site/sass/main.sass | 11 ++++++++--- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/src/site/api/routes.js b/src/site/api/routes.js index c356716..f0b65ca 100644 --- a/src/site/api/routes.js +++ b/src/site/api/routes.js @@ -15,7 +15,8 @@ module.exports = [ return render(400, "pug/friendlyerror.pug", { statusCode: 400, title: "Bad request", - message: "Expected a username." + message: "Expected a username", + explanation: "Write /u/{username} or /u?u={username}." }) } } @@ -54,7 +55,7 @@ module.exports = [ return { statusCode: 400, contentType: "text/html", - content: "That page does not exist" + content: "That page does not exist." } } }).catch(error => { @@ -80,7 +81,8 @@ module.exports = [ return render(400, "pug/friendlyerror.pug", { statusCode: 400, title: "Bad request", - message: "Expected a username." + message: "Expected a shortcode", + explanation: "Write /p/{shortcode} or /p?u={shortcode}." }) } } diff --git a/src/site/pug/friendlyerror.pug b/src/site/pug/friendlyerror.pug index b8138a2..58ff684 100644 --- a/src/site/pug/friendlyerror.pug +++ b/src/site/pug/friendlyerror.pug @@ -15,4 +15,6 @@ html body.error-page h1.code= statusCode p.message= message + if explanation + p.explanation= explanation a(href="javascript:history.back()").back ← Go back? diff --git a/src/site/sass/main.sass b/src/site/sass/main.sass index 7822b4c..0ea4147 100644 --- a/src/site/sass/main.sass +++ b/src/site/sass/main.sass @@ -260,6 +260,7 @@ body margin-bottom: 10px .error-page + box-sizing: border-box min-height: 100vh background: #191919 padding: 10px @@ -269,10 +270,9 @@ body justify-content: center align-items: center - .code, .message, .back-link + .code, .message, .explanation, .back-link line-height: 1.2 margin: 0px - color: white .code font-size: 80px @@ -282,9 +282,14 @@ body .message font-size: 35px color: #ccc - margin-bottom: 15vh + + .explanation + margin-top: 10px + font-size: 20px + color: #bbb .back + margin-top: 15vh color: #4a93d2 font-size: 25px