From 457eb8b7339bdce02552a34afc56e7f90f40a743 Mon Sep 17 00:00:00 2001 From: yuki Date: Wed, 15 Oct 2025 17:28:01 -0300 Subject: [PATCH] restructure layouts and includes to be written around njk blocks --- _includes/{footer.njk => default_footer.njk} | 4 +- _includes/default_header.njk | 11 +++ _layouts/base.njk | 46 +++++------ _layouts/home.njk | 81 +++++++++++--------- _layouts/post.njk | 6 +- en/index.md | 1 + es/index.md | 1 + 7 files changed, 86 insertions(+), 64 deletions(-) rename _includes/{footer.njk => default_footer.njk} (83%) create mode 100644 _includes/default_header.njk diff --git a/_includes/footer.njk b/_includes/default_footer.njk similarity index 83% rename from _includes/footer.njk rename to _includes/default_footer.njk index 5bfbe23..b8a2480 100644 --- a/_includes/footer.njk +++ b/_includes/default_footer.njk @@ -1,6 +1,8 @@
- {% include "lang-available.njk" %} + {% if show-lang-in-footer %} + {% include "lang-available.njk" %} + {% endif %}
diff --git a/_includes/default_header.njk b/_includes/default_header.njk new file mode 100644 index 0000000..014bcd7 --- /dev/null +++ b/_includes/default_header.njk @@ -0,0 +1,11 @@ +
+

{{ meta.sitename }}

+
+ +
+ +{% include "default_navbar.njk" %} diff --git a/_layouts/base.njk b/_layouts/base.njk index 26e319a..2ffcab1 100644 --- a/_layouts/base.njk +++ b/_layouts/base.njk @@ -1,47 +1,39 @@ ---- -lastfm: false -flight: - img: "/img/Witch-on-broom.gif" - url: "https://www.youtube.com/embed/w1dXpAJ1qfA" ---- - {% include "base_head.njk" %} + {% block head %} + {% include "base_head.njk" %} + {% endblock head %}
-
-

{{ meta.sitename }}

-
- -
- - {% include "default_navbar.njk" %} + {% block header %} + {% include "default_header.njk" %} + {% endblock header %}
-

{{ "mobile-warning" | i18n }}

- {{ content | safe }} + {% block content %} + + {% endblock content %}
- - - - {% include "footer.njk" %} + {% block footer %} + {% if flight %} + + + + {% endif %} + {% include "default_footer.njk" %} + {% endblock footer %}
- {% if lastfm %} - - {% endif %} + + {% block scripts %}{% endblock scripts %} diff --git a/_layouts/home.njk b/_layouts/home.njk index 5e9aac9..0355b2c 100644 --- a/_layouts/home.njk +++ b/_layouts/home.njk @@ -1,42 +1,53 @@ --- -layout: base -title: home lastfm: true +flight: + img: "/img/Witch-on-broom.gif" + url: "https://www.youtube.com/embed/w1dXpAJ1qfA" --- -
-
- -
-

{{ "please-visit" | i18n }}

-
- {% for button in 88x31.buttons.people.slice(0, 5) %} - - {% if button.image.startsWith("http") %} - {{ button.name }} - {% else %} - {{ button.name }} - {% endif %} - - {% endfor %} +{% extends "_layouts/base.njk" %} + +{% block content %} +
+
+ +
+

{{ "please-visit" | i18n }}

+
+ {% for button in 88x31.buttons.people.slice(0, 5) %} + + {% if button.image.startsWith("http") %} + {{ button.name }} + {% else %} + {{ button.name }} + {% endif %} + + {% endfor %} +
-
-
- {{ content | safe }} -
- -
-
-

{{ "recent-posts" | i18n }}

-
    - {% for post in collections.post | i18n_filter(5) %} -

  • {{ post.data.title }}
    {{ post.date.toLocaleString("en-GB", {year: 'numeric', month: '2-digit', day: '2-digit'}) }}

    • - {% endfor %} -
+
+ {{ content | safe }}
- - -
+ +
+
+

{{ "recent-posts" | i18n }}

+
    + {% for post in collections.post | i18n_filter(5) %} +

  • {{ post.data.title }}
    {{ post.date.toLocaleString("en-GB", {year: 'numeric', month: '2-digit', day: '2-digit'}) }}

    • + {% endfor %} +
+
+ + +
+{% endblock content %} + +{% block scripts %} + {% if lastfm %} + + {% endif %} +{% endblock scripts %} diff --git a/_layouts/post.njk b/_layouts/post.njk index d258888..85e48a9 100644 --- a/_layouts/post.njk +++ b/_layouts/post.njk @@ -1,4 +1,8 @@ --- -layout: base +# TODO: finish post page tags: post --- +{% extends "_layouts/base.njk" %} +{% block content %} + {{ content | safe }} +{% endblock content %} diff --git a/en/index.md b/en/index.md index 3e260a4..1642aac 100644 --- a/en/index.md +++ b/en/index.md @@ -1,4 +1,5 @@ --- +title: home layout: home --- #### hey... diff --git a/es/index.md b/es/index.md index feb9433..1a7de8b 100644 --- a/es/index.md +++ b/es/index.md @@ -1,5 +1,6 @@ --- layout: home +title: home --- #### holaaa bienvenid@ a mi sitio!! aun no lo termino pero revisa lo que tenga hecho <3 pienso terminar primero: