From afc733f4d464bdeaccf4ad8949ac2189f3349cd8 Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 26 Oct 2025 15:29:12 +0100 Subject: [PATCH] feat: Replace default screen using liquid instead of nunjucks --- source/screens/demo/pages/default.liquid | 18 +++++++++ source/screens/demo/pages/default.njk | 21 ----------- source/screens/{ => demo/pages}/hello.md | 2 - source/templates/hippie/default.liquid | 37 +++++++++++++++++++ source/templates/hippie/partials/links.liquid | 3 ++ source/templates/hippie/partials/meta.liquid | 7 ++++ 6 files changed, 65 insertions(+), 23 deletions(-) create mode 100644 source/screens/demo/pages/default.liquid delete mode 100644 source/screens/demo/pages/default.njk rename source/screens/{ => demo/pages}/hello.md (76%) create mode 100644 source/templates/hippie/default.liquid create mode 100644 source/templates/hippie/partials/links.liquid create mode 100644 source/templates/hippie/partials/meta.liquid diff --git a/source/screens/demo/pages/default.liquid b/source/screens/demo/pages/default.liquid new file mode 100644 index 0000000..026c6da --- /dev/null +++ b/source/screens/demo/pages/default.liquid @@ -0,0 +1,18 @@ +--- +title: "Default" +--- +{% assign pageBase = "../" -%} +{% assign pageId = page.fileSlug -%} +{% assign pageClass = "default" -%} +{% assign bodyClass = "default" -%} +{%- layout "hippie/default.liquid" %} + +{% block title %}{{ title }}{% endblock %} + +{% block script %} +{{ block.super -}} + +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/pages/default.njk b/source/screens/demo/pages/default.njk deleted file mode 100644 index a898098..0000000 --- a/source/screens/demo/pages/default.njk +++ /dev/null @@ -1,21 +0,0 @@ ---- -title: Default ---- -{% set pageBase = "../" %} -{% set pageId = page.fileSlug %} - -{% extends "hippie/_default.njk" %} - -{% block title %}{{ title }}{% endblock %} - -{% block head %} -{{ super() }} -{% endblock %} - -{% block body %} - -{% endblock %} - -{% block script %} -{{ super() }} -{% endblock %} diff --git a/source/screens/hello.md b/source/screens/demo/pages/hello.md similarity index 76% rename from source/screens/hello.md rename to source/screens/demo/pages/hello.md index d6ff3be..09a9406 100644 --- a/source/screens/hello.md +++ b/source/screens/demo/pages/hello.md @@ -1,7 +1,5 @@ --- title: "Hello World" -tags: - - demoIndex layout: hippie/world.liquid --- diff --git a/source/templates/hippie/default.liquid b/source/templates/hippie/default.liquid new file mode 100644 index 0000000..cfd5417 --- /dev/null +++ b/source/templates/hippie/default.liquid @@ -0,0 +1,37 @@ + +{% if pageId %} +{%- capture idAttr %} id="{{ pageId }}"{% endcapture -%} +{% endif -%} +{% if pageClass %} + {%- capture classAttr %} class="{{ pageClass }}"{% endcapture -%} +{% endif -%} +{% if bodyClass %} + {%- capture bodyClassAttr %} class="{{ bodyClass }}"{% endcapture -%} +{% endif -%} + + + + {% block head %} + + {{- hippie.titlePrefix -}} + {% block title %}{% endblock -%} + {{ hippie.titlePostfix -}} + + {% block meta -%} + {% render "hippie/partials/meta.liquid" %} + {% endblock -%} + {% block links -%} + {% render "hippie/partials/links.liquid" %} + {% endblock -%} + {% endblock -%} + + + +{%- block body %}{% endblock -%} +{% block script -%} + +{% endblock -%} + + \ No newline at end of file diff --git a/source/templates/hippie/partials/links.liquid b/source/templates/hippie/partials/links.liquid new file mode 100644 index 0000000..c1a8845 --- /dev/null +++ b/source/templates/hippie/partials/links.liquid @@ -0,0 +1,3 @@ +{% comment %}{% endcomment %} + + diff --git a/source/templates/hippie/partials/meta.liquid b/source/templates/hippie/partials/meta.liquid new file mode 100644 index 0000000..fa0516e --- /dev/null +++ b/source/templates/hippie/partials/meta.liquid @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file