learn-javascript-the-hard-way
/
bandolier2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix a few things related to running pages and trying to read directories.

Browse Source
main
Zed A. Shaw 9 months ago
parent a43d47fc01
commit 044be2a8c6
3 changed files with 21 additions and 28 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 31
      commands/app.js
  2. 2
      knexfile.cjs
  3. 16
      pages/index.html

31
commands/app.js
Unescape View File

@ -52,19 +52,24 @@ const configure = async (fastify, opts) => {
app.register(Formbody); app.register(Formbody);
app.get("/*", (req, rep) => { app.get("/*", (req, rep) => {
const target = path.resolve(path.join("pages", req.url)); try {
const index = path.resolve(path.join("pages", req.url, "index.html")); const target = path.resolve(path.join("pages", req.url));
const index = path.resolve(path.join("pages", req.url, "index.html"));
if(fs.existsSync(index)) {
const result = nunjucks.render(index); if(fs.existsSync(index) && !fs.statSync(index).isDirectory()) {
rep.code(200).type("text/html").send(result); const result = nunjucks.render(index);
} else if(fs.existsSync(target)) { rep.code(200).type("text/html").send(result);
const fname = req.url.slice(1); } else if(fs.existsSync(target)) {
const result = nunjucks.render(fname); const fname = req.url.slice(1);
rep.code(200).type("text/html").send(result); const result = nunjucks.render(fname);
} else { rep.code(200).type("text/html").send(result);
console.error("404 NOT FOUND", target, "NO INDEX", index); } else {
rep.code(404).type("text/html").send("Not Found"); console.error("404 NOT FOUND", target, "NO INDEX", index);
rep.code(404).type("text/html").send("Not Found");
}
} catch(error) {
console.error(error);
rep.code(500).type("text/html").send("Internal Server Error");
} }
}); });

2
knexfile.cjs
Unescape View File

@ -6,7 +6,7 @@ module.exports = {
client: 'sqlite3', client: 'sqlite3',
useNullAsDefault: true, useNullAsDefault: true,
connection: { connection: {
filename: './dev.sqlite3' filename: './db/dev.sqlite3'
} }
}, },

16
static/index.html → pages/index.html
Unescape View File

@ -1,16 +1,5 @@
<!doctype html> {% include "./header.html" %}
<html lang="en" dir="ltr">
<head>
<meta charset="utf-8">
<script src="/alpine.js"></script>
<title>Bandolier2</title>
<style> <style>
@import "/open-props.min.css";
@import "/normalize.min.css";
body { body {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
@ -118,5 +107,4 @@ button.primary:hover {
One day I will learn how to run without falling. One day I will learn how to run without falling.
</blockquote> </blockquote>
</section> </section>
</body> {% include "./footer.html" %}
</html>
Write Preview
Loading…
Cancel
Save