diff --git a/package-lock.json b/package-lock.json index 681ab52..e7b1803 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1340,12 +1340,12 @@ "dev": true }, "globule": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.0.tgz", - "integrity": "sha512-YlD4kdMqRCQHrhVdonet4TdRtv1/sZKepvoxNT4Nrhrp5HI8XFfc8kFlGlBn2myBo80aGp8Eft259mbcUJhgSg==", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/globule/-/globule-1.3.1.tgz", + "integrity": "sha512-OVyWOHgw29yosRHCHo7NncwR1hW5ew0W/UrvtwvjefVJeQ26q4/8r8FmPsSF1hJ93IgWkyv16pCTz6WblMzm/g==", "requires": { "glob": "~7.1.1", - "lodash": "~4.17.10", + "lodash": "~4.17.12", "minimatch": "~3.0.2" } }, @@ -1564,12 +1564,9 @@ "dev": true }, "is-finite": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz", - "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=", - "requires": { - "number-is-nan": "^1.0.0" - } + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.1.0.tgz", + "integrity": "sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==" }, "is-fullwidth-code-point": { "version": "1.0.0", @@ -1808,9 +1805,9 @@ } }, "js-base64": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz", - "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw==" + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.2.tgz", + "integrity": "sha512-Vg8czh0Q7sFBSUMWWArX/miJeBWYBPpdU/3M/DKSaekLMqrqVPaedp+5mZhie/r0lgrcaYBfwXatEew6gwgiQQ==" }, "js-stringify": { "version": "1.0.2", @@ -2727,8 +2724,8 @@ } }, "pinski": { - "version": "github:cloudrac3r/pinski#9eb56d90fdd00357451dd5a546dbcca1f9bf114a", - "from": "github:cloudrac3r/pinski#9eb56d90fdd00357451dd5a546dbcca1f9bf114a", + "version": "github:cloudrac3r/pinski#1193025936cac58ac329b30e0749884bba6abb11", + "from": "github:cloudrac3r/pinski#1193025936cac58ac329b30e0749884bba6abb11", "requires": { "mime": "^2.4.4", "node-sass": "^4.13.1", diff --git a/package.json b/package.json index 95ac3c6..c548892 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "mixin-deep": "^2.0.1", "node-dir": "^0.1.17", "node-fetch": "^2.6.0", - "pinski": "github:cloudrac3r/pinski#9eb56d90fdd00357451dd5a546dbcca1f9bf114a", + "pinski": "github:cloudrac3r/pinski#1193025936cac58ac329b30e0749884bba6abb11", "pug": "^2.0.4", "semver": "^7.1.2", "sharp": "^0.24.0", diff --git a/src/site/pug/404.pug b/src/site/pug/404.pug new file mode 100644 index 0000000..c107fef --- /dev/null +++ b/src/site/pug/404.pug @@ -0,0 +1,10 @@ +include includes/error + +doctype html +html + head + title Not found | Bibliogram + include includes/head + + body.error-page + +error(404, "Page not found.") diff --git a/src/site/pug/friendlyerror.pug b/src/site/pug/friendlyerror.pug index 6e6dd31..f03b5bb 100644 --- a/src/site/pug/friendlyerror.pug +++ b/src/site/pug/friendlyerror.pug @@ -2,8 +2,6 @@ include includes/error.pug -- const numberFormat = new Intl.NumberFormat().format - doctype html html head diff --git a/src/site/server.js b/src/site/server.js index 7b56d66..91513bc 100644 --- a/src/site/server.js +++ b/src/site/server.js @@ -19,7 +19,8 @@ subdirs("pug", async (err, dirs) => { // need to check for and run db upgrades before anything starts using it await require("../lib/utils/upgradedb")() - //pinski.addRoute("/", "pug/index.pug", "pug") + pinski.addRoute("/404", "pug/404.pug", "pug") + pinski.setNotFoundTarget("/404") pinski.addRoute("/static/css/main.css", "sass/main.sass", "sass") pinski.addPugDir("pug", dirs) pinski.addAPIDir("html/static/js/templates/api")