From 6b8dfa650c1fa1e8b3d7df73633c91752ccca97b Mon Sep 17 00:00:00 2001 From: kalanggam <62631102+kalanggam@users.noreply.github.com> Date: Thu, 19 Oct 2023 21:05:29 -0500 Subject: [PATCH] Re-arrange _includes templates --- src/_data/meta.js | 2 +- src/_includes/base.njk | 11 +++-------- src/_includes/footer.njk | 1 + src/_includes/header.njk | 3 +++ src/_includes/page.njk | 8 ++++++++ src/ceb/index.md | 2 +- src/index.md | 16 +++++----------- src/now.md | 2 +- src/poetry/index.md | 2 +- src/poetry/poetry.json | 2 +- 10 files changed, 25 insertions(+), 24 deletions(-) create mode 100644 src/_includes/footer.njk create mode 100644 src/_includes/header.njk create mode 100644 src/_includes/page.njk diff --git a/src/_data/meta.js b/src/_data/meta.js index 3e8bbcb..9df0985 100644 --- a/src/_data/meta.js +++ b/src/_data/meta.js @@ -1,5 +1,5 @@ module.exports = { siteName: "gils.nexus", siteDescription: "", - authorName: "", + authorName: "gil", }; diff --git a/src/_includes/base.njk b/src/_includes/base.njk index d347d26..fbfc18f 100644 --- a/src/_includes/base.njk +++ b/src/_includes/base.njk @@ -1,17 +1,12 @@ - + {% if title %}{{ title }} | {% endif %}{{ meta.siteName }} - + -
-

{{ title }}

-
-
- {{ content | safe }} -
+ {{ content | safe }} diff --git a/src/_includes/footer.njk b/src/_includes/footer.njk new file mode 100644 index 0000000..4a8bf4d --- /dev/null +++ b/src/_includes/footer.njk @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/_includes/header.njk b/src/_includes/header.njk new file mode 100644 index 0000000..45e7fcc --- /dev/null +++ b/src/_includes/header.njk @@ -0,0 +1,3 @@ +
+

{{ title or meta.siteName }}

+
\ No newline at end of file diff --git a/src/_includes/page.njk b/src/_includes/page.njk new file mode 100644 index 0000000..e8ba13a --- /dev/null +++ b/src/_includes/page.njk @@ -0,0 +1,8 @@ +--- +layout: base.njk +--- +{% include "header.njk" %} +
+{{ content | safe }} +
+{% include "footer.njk" %} \ No newline at end of file diff --git a/src/ceb/index.md b/src/ceb/index.md index d2d64fa..e5501aa 100644 --- a/src/ceb/index.md +++ b/src/ceb/index.md @@ -1,6 +1,6 @@ --- title: Cebuano -layout: base.njk +layout: page.njk --- [← Home](/) diff --git a/src/index.md b/src/index.md index f3682b2..bf8081c 100644 --- a/src/index.md +++ b/src/index.md @@ -1,12 +1,9 @@ --- -title: gils.nexus -layout: base.njk +layout: page.njk date: Last Modified --- -hello! my name is gil and this is my site. pronouns are he/they. i write and -tinker with software/hardware. i don't have much to put here except -links (for now). +hello! my name is gil and this is my site. pronouns are he/they. i write and tinker with software/hardware. i don't have much to put here except links (for now). --- @@ -20,12 +17,9 @@ links (for now). ## Links -[hol.ogra.ph](https://hol.ogra.ph/@gil) — federated -microblogging (i'm a co-admin here!) -[pixelfed.social](https://pixelfed.social/kalanggam) — -federated photo and video sharing -[beehaw](https://beehaw.org/u/kalanggam) — federated link -aggregator/discussions +[hol.ogra.ph](https://hol.ogra.ph/@gil) — federated microblogging (i'm a co-admin here!) +[pixelfed.social](https://pixelfed.social/kalanggam) — federated photo and video sharing +[beehaw](https://beehaw.org/u/kalanggam) — federated link aggregator/discussions [bookwyrm.social](https://bookwyrm.social/user/kalanggam) — federated book reviews --- diff --git a/src/now.md b/src/now.md index 251b235..320fc9a 100644 --- a/src/now.md +++ b/src/now.md @@ -1,6 +1,6 @@ --- title: Now -layout: base.njk +layout: page.njk --- Hello! diff --git a/src/poetry/index.md b/src/poetry/index.md index 2f77da6..823fd84 100644 --- a/src/poetry/index.md +++ b/src/poetry/index.md @@ -1,6 +1,6 @@ --- title: Poetry -layout: base.njk +layout: page.njk permalink: /poetry/index.html override:tags: [] --- diff --git a/src/poetry/poetry.json b/src/poetry/poetry.json index f7a5ad9..3f96289 100644 --- a/src/poetry/poetry.json +++ b/src/poetry/poetry.json @@ -1,5 +1,5 @@ { - "layout": "base.njk", + "layout": "page.njk", "permalink": "/poem/{{ page.fileSlug }}/", "tags": "poems" } \ No newline at end of file