From da86b19aba5b186a230a6f3cdc5ade7ca453b493 Mon Sep 17 00:00:00 2001 From: sthag Date: Sun, 11 Aug 2024 15:15:07 +0200 Subject: [PATCH] feat: use collections and add frontmatter --- source/screens/demo/basics.njk | 9 ++- source/screens/demo/components.njk | 9 ++- source/screens/demo/examples/card.njk | 9 ++- source/screens/demo/examples/portal.njk | 9 ++- source/screens/demo/index.json | 76 ----------------------- source/screens/demo/index.njk | 23 ++++--- source/screens/demo/introduction.njk | 7 ++- source/screens/demo/layouts.njk | 9 ++- source/screens/demo/pages/blank.njk | 10 +-- source/screens/demo/pages/error/304.njk | 10 +-- source/screens/demo/pages/error/400.njk | 10 +-- source/screens/demo/pages/error/401.njk | 10 +-- source/screens/demo/pages/error/403.njk | 10 +-- source/screens/demo/pages/error/404.njk | 10 +-- source/screens/demo/pages/error/408.njk | 10 +-- source/screens/demo/pages/error/500.njk | 10 +-- source/screens/demo/pages/error/503.njk | 10 +-- source/screens/demo/pages/maintenance.njk | 9 ++- source/screens/demo/pages/pages.json | 3 + 19 files changed, 117 insertions(+), 136 deletions(-) delete mode 100644 source/screens/demo/index.json create mode 100644 source/screens/demo/pages/pages.json diff --git a/source/screens/demo/basics.njk b/source/screens/demo/basics.njk index 252baf3..80c456f 100644 --- a/source/screens/demo/basics.njk +++ b/source/screens/demo/basics.njk @@ -1,6 +1,10 @@ - +--- +title: Basics +tags: + - index +--- {% set pageBase = "../" %} -{% set pageId = "basics" %} +{% set pageId = page.fileSlug %} {% extends "demo/_main.njk" %} @@ -10,6 +14,7 @@ {% endblock %} {% block main %} + {% include "hippie/partials/_body_nav.njk" %}
diff --git a/source/screens/demo/components.njk b/source/screens/demo/components.njk index 6a62414..eb07822 100644 --- a/source/screens/demo/components.njk +++ b/source/screens/demo/components.njk @@ -1,6 +1,10 @@ - +--- +title: Components +tags: + - index +--- {% set pageBase = "../" %} -{% set pageId = "components" %} +{% set pageId = page.fileSlug %} {% extends "demo/_main.njk" %} @@ -10,6 +14,7 @@ {% endblock %} {% block main %} +
{% include "hippie/partials/_body_nav.njk" %} diff --git a/source/screens/demo/examples/card.njk b/source/screens/demo/examples/card.njk index 4a38369..e917881 100644 --- a/source/screens/demo/examples/card.njk +++ b/source/screens/demo/examples/card.njk @@ -1,6 +1,10 @@ - +--- +title: Card +tags: + - example +--- {% set pageBase = "../" %} -{% set pageId = "card" %} +{% set pageId = page.fileSlug %} {% set pageClass = "html_card" %} {% extends "demo/_default.njk" %} @@ -13,6 +17,7 @@ {% endblock %} {% block body %} +
diff --git a/source/screens/demo/examples/portal.njk b/source/screens/demo/examples/portal.njk index c6e7b45..981602a 100644 --- a/source/screens/demo/examples/portal.njk +++ b/source/screens/demo/examples/portal.njk @@ -1,6 +1,10 @@ - +--- +title: Portal +tags: + - example +--- {% set pageBase = "../" %} -{% set pageId = "index" %} +{% set pageId = page.fileSlug %} {% set bodyClass = "body_portal" %} {% extends "demo/_default.njk" %} @@ -14,6 +18,7 @@ {% endblock %} {% block body %} +
{{ gate.list( 'Tor mit Symbol und Liste', diff --git a/source/screens/demo/index.json b/source/screens/demo/index.json deleted file mode 100644 index 9469dfc..0000000 --- a/source/screens/demo/index.json +++ /dev/null @@ -1,76 +0,0 @@ -{ - "index": [ - { - "href": "index.html", - "text": "Index" - }, - { - "href": "introduction.html", - "text": "Introduction" - }, - { - "href": "basics.html", - "text": "Basics" - }, - { - "href": "components.html", - "text": "Components" - }, - { - "href": "layouts.html", - "text": "Layouts" - } - ], - "pages": [ - { - "href": "pages/blank.html", - "text": "Blank" - }, - { - "href": "pages/maintenance.html", - "text": "Maintenance" - }, - { - "href": "pages/error/304.html", - "text": "304" - }, - { - "href": "pages/error/400.html", - "text": "400" - }, - { - "href": "pages/error/401.html", - "text": "401" - }, - { - "href": "pages/error/403.html", - "text": "403" - }, - { - "href": "pages/error/404.html", - "text": "404" - }, - { - "href": "pages/error/408.html", - "text": "408" - }, - { - "href": "pages/error/500.html", - "text": "500" - } - ], - "demo": [ - { - "href": "examples/card.html", - "text": "Card" - }, - { - "href": "examples/portal.html", - "text": "Portal" - }, - { - "href": "examples/songbook.html", - "text": "Songbook" - } - ] -} \ No newline at end of file diff --git a/source/screens/demo/index.njk b/source/screens/demo/index.njk index 8468e88..47f1c1e 100644 --- a/source/screens/demo/index.njk +++ b/source/screens/demo/index.njk @@ -1,9 +1,11 @@ --- permalink: "/" +title: Index +tags: + - index --- - {% set pageBase = hippie.pageBase %} -{% set pageId = "index" %} +{% set pageId = page.fileSlug %} {% set pageClass = "h_full_view" %} {% extends "demo/_default.njk" %} @@ -14,6 +16,7 @@ permalink: "/" {% endblock %} {% block body %} +

This is @@ -40,26 +43,26 @@ permalink: "/"

-

Pages

+

Page

-

Demo

+

Example

diff --git a/source/screens/demo/introduction.njk b/source/screens/demo/introduction.njk index a4580ca..d25b1ad 100644 --- a/source/screens/demo/introduction.njk +++ b/source/screens/demo/introduction.njk @@ -1,4 +1,8 @@ - +--- +title: Introduction +tags: + - index +--- {% set pageBase = "../" %} {% set pageId = "intro" %} @@ -10,6 +14,7 @@ {% endblock %} {% block main %} + {% include "hippie/partials/_body_nav.njk" %}
diff --git a/source/screens/demo/layouts.njk b/source/screens/demo/layouts.njk index dce2d98..e06b384 100644 --- a/source/screens/demo/layouts.njk +++ b/source/screens/demo/layouts.njk @@ -1,6 +1,10 @@ - +--- +title: Layouts +tags: + - index +--- {% set pageBase = "../" %} -{% set pageId = "layouts" %} +{% set pageId = page.fileSlug %} {% extends "demo/_main.njk" %} @@ -10,6 +14,7 @@ {% endblock %} {% block main %} +
{% include "hippie/partials/_body_nav.njk" %} diff --git a/source/screens/demo/pages/blank.njk b/source/screens/demo/pages/blank.njk index de1faef..3ff646f 100644 --- a/source/screens/demo/pages/blank.njk +++ b/source/screens/demo/pages/blank.njk @@ -1,18 +1,20 @@ - +--- +title: Blank +--- {% set pageBase = "../" %} -{% set pageId = "blank" %} +{% set pageId = page.fileSlug %} {% set pageClass = "h_full_view" %} {% extends "demo/_default.njk" %} -{% block title %}Blank{% endblock %} +{% block title %}{{ title }}{% endblock %} {% block head %} {{ super() }} {% endblock %} {% block body %} - + {% endblock %} {% block script %} diff --git a/source/screens/demo/pages/error/304.njk b/source/screens/demo/pages/error/304.njk index 20db3e7..1d47451 100644 --- a/source/screens/demo/pages/error/304.njk +++ b/source/screens/demo/pages/error/304.njk @@ -1,18 +1,20 @@ - +--- +title: 304 +--- {% set pageBase = "../../" %} -{% set pageId = "304" %} +{% set pageId = page.fileSlug %} {% set bodyClass = "body_status" %} {% extends "demo/_maintenance.njk" %} -{% block title %}{{ pageId }}{% endblock %} +{% block title %}{{ title }}{% endblock %} {% block head %} {{ super() }} {% endblock %} {% block body %}
-

{{ pageId }}

+

{{ title }}

Umleitung

Unverändert Not Modified

diff --git a/source/screens/demo/pages/error/400.njk b/source/screens/demo/pages/error/400.njk index 1122396..087b9a8 100644 --- a/source/screens/demo/pages/error/400.njk +++ b/source/screens/demo/pages/error/400.njk @@ -1,18 +1,20 @@ - +--- +title: 400 +--- {% set pageBase = "../../" %} -{% set pageId = "400" %} +{% set pageId = page.fileSlug %} {% set bodyClass = "body_status" %} {% extends "demo/_maintenance.njk" %} -{% block title %}{{ pageId }}{% endblock %} +{% block title %}{{ title }}{% endblock %} {% block head %} {{ super() }} {% endblock %} {% block body %}
-

{{ pageId }}

+

{{ title }}

Client-Fehler

Fehlerhafte Anfrage! Bad Request

diff --git a/source/screens/demo/pages/error/401.njk b/source/screens/demo/pages/error/401.njk index 7e7108c..f38c3f9 100644 --- a/source/screens/demo/pages/error/401.njk +++ b/source/screens/demo/pages/error/401.njk @@ -1,18 +1,20 @@ - +--- +title: 401 +--- {% set pageBase = "../../" %} -{% set pageId = "401" %} +{% set pageId = page.fileSlug %} {% set bodyClass = "body_status" %} {% extends "demo/_maintenance.njk" %} -{% block title %}{{ pageId }}{% endblock %} +{% block title %}{{ title }}{% endblock %} {% block head %} {{ super() }} {% endblock %} {% block body %}
-

{{ pageId }}

+

{{ title }}

Client-Fehler

Nicht autorisiert! Unauthorized

diff --git a/source/screens/demo/pages/error/403.njk b/source/screens/demo/pages/error/403.njk index 3fc9b1d..03904e4 100644 --- a/source/screens/demo/pages/error/403.njk +++ b/source/screens/demo/pages/error/403.njk @@ -1,18 +1,20 @@ - +--- +title: 403 +--- {% set pageBase = "../../" %} -{% set pageId = "403" %} +{% set pageId = page.fileSlug %} {% set bodyClass = "body_status" %} {% extends "demo/_maintenance.njk" %} -{% block title %}{{ pageId }}{% endblock %} +{% block title %}{{ title }}{% endblock %} {% block head %} {{ super() }} {% endblock %} {% block body %}
-

{{ pageId }}

+

{{ title }}

Client-Fehler

Nicht erlaubt! Forbidden

diff --git a/source/screens/demo/pages/error/404.njk b/source/screens/demo/pages/error/404.njk index ba9e0cd..bebd4f5 100644 --- a/source/screens/demo/pages/error/404.njk +++ b/source/screens/demo/pages/error/404.njk @@ -1,18 +1,20 @@ - +--- +title: 404 +--- {% set pageBase = "../../" %} -{% set pageId = "404" %} +{% set pageId = page.fileSlug %} {% set bodyClass = "body_status" %} {% extends "demo/_maintenance.njk" %} -{% block title %}{{ pageId }}{% endblock %} +{% block title %}{{ title }}{% endblock %} {% block head %} {{ super() }} {% endblock %} {% block body %}
-

{{ pageId }}

+

{{ title }}

Client-Fehler

Hier ist nichts. Not Found

diff --git a/source/screens/demo/pages/error/408.njk b/source/screens/demo/pages/error/408.njk index 6c679ab..c5e10e0 100644 --- a/source/screens/demo/pages/error/408.njk +++ b/source/screens/demo/pages/error/408.njk @@ -1,18 +1,20 @@ - +--- +title: 408 +--- {% set pageBase = "../../" %} -{% set pageId = "408" %} +{% set pageId = page.fileSlug %} {% set bodyClass = "body_status" %} {% extends "demo/_maintenance.njk" %} -{% block title %}{{ pageId }}{% endblock %} +{% block title %}{{ title }}{% endblock %} {% block head %} {{ super() }} {% endblock %} {% block body %}
-

{{ pageId }}

+

{{ title }}

Client-Fehler

Zeitüberschreitung der Anforderung. Request Timeout

diff --git a/source/screens/demo/pages/error/500.njk b/source/screens/demo/pages/error/500.njk index 001c27a..d04c5c8 100644 --- a/source/screens/demo/pages/error/500.njk +++ b/source/screens/demo/pages/error/500.njk @@ -1,18 +1,20 @@ - +--- +title: 500 +--- {% set pageBase = "../../" %} -{% set pageId = "500" %} +{% set pageId = page.fileSlug %} {% set bodyClass = "body_status" %} {% extends "demo/_maintenance.njk" %} -{% block title %}{{ pageId }}{% endblock %} +{% block title %}{{ title }}{% endblock %} {% block head %} {{ super() }} {% endblock %} {% block body %}
-

{{ pageId }}

+

{{ title }}

Server-Fehler

Allgemeiner Server Fehler!!! Internal Server Error

diff --git a/source/screens/demo/pages/error/503.njk b/source/screens/demo/pages/error/503.njk index 4ca521d..f215a54 100644 --- a/source/screens/demo/pages/error/503.njk +++ b/source/screens/demo/pages/error/503.njk @@ -1,18 +1,20 @@ - +--- +title: 503 +--- {% set pageBase = "../../" %} -{% set pageId = "503" %} +{% set pageId = page.fileSlug %} {% set bodyClass = "body_status" %} {% extends "demo/_maintenance.njk" %} -{% block title %}{{ pageId }}{% endblock %} +{% block title %}{{ title }}{% endblock %} {% block head %} {{ super() }} {% endblock %} {% block body %}
-

{{ pageId }}

+

{{ title }}

Server-Fehler

Dienst nicht verfügbar. Service Unavailable

diff --git a/source/screens/demo/pages/maintenance.njk b/source/screens/demo/pages/maintenance.njk index 03faa16..b9cd3fe 100644 --- a/source/screens/demo/pages/maintenance.njk +++ b/source/screens/demo/pages/maintenance.njk @@ -1,17 +1,20 @@ - +--- +title: Maintenance +--- {% set pageBase = "../" %} -{% set pageId = "blank" %} +{% set pageId = page.fileSlug %} {% set pageClass = "h_full_view" %} {% extends "demo/_maintenance.njk" %} -{% block title %}Maintenance{% endblock %} +{% block title %}{{ title }}{% endblock %} {% block head %} {{ super() }} {% endblock %} {% block body %} +

HIPPIE

diff --git a/source/screens/demo/pages/pages.json b/source/screens/demo/pages/pages.json new file mode 100644 index 0000000..bc9f264 --- /dev/null +++ b/source/screens/demo/pages/pages.json @@ -0,0 +1,3 @@ +{ + "tags": "page" +}