From 8eb377717a30c9866c5e45d9390a7efc2c9374d1 Mon Sep 17 00:00:00 2001 From: sthag Date: Thu, 8 Aug 2024 20:35:08 +0200 Subject: [PATCH 1/5] fix: variable naming --- .eleventy.js | 5 +++-- gulp/config.js | 2 +- source/templates/demo/_default.njk | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.eleventy.js b/.eleventy.js index ce05d34..da25e16 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -9,9 +9,10 @@ module.exports = function (eleventyConfig) { }); eleventyConfig.addGlobalData("hippie", { + pageBase: './', brand: 'hippie', - titlePrefix: ' - HIPPIE', - pageBase: './' + titlePrefix: '', + titlePostfix: ' - HIPPIE' }); eleventyConfig.addPassthroughCopy({"source/art/images": "art"}); diff --git a/gulp/config.js b/gulp/config.js index 257f453..7a03f07 100644 --- a/gulp/config.js +++ b/gulp/config.js @@ -17,7 +17,7 @@ const config = { hippie: { brand: 'hippie', - titlePrefix: ' - HIPPIE', + titlePostfix: ' - HIPPIE', pageBase: './' } }; diff --git a/source/templates/demo/_default.njk b/source/templates/demo/_default.njk index 902d5fb..1f67848 100644 --- a/source/templates/demo/_default.njk +++ b/source/templates/demo/_default.njk @@ -6,7 +6,7 @@ {% block head %} - {% block title %}{% endblock %}{{ hippie.titlePrefix }} + {% block title %}{% endblock %}{{ hippie.titlePostfix }} {% include "demo/partials/_meta.njk" %} {# #} From b17e16abd99ecdb1b65f3f1b392223cfa7bfc8f4 Mon Sep 17 00:00:00 2001 From: sthag Date: Thu, 8 Aug 2024 20:42:28 +0200 Subject: [PATCH 2/5] feat: add placeholder and rearrange files --- source/screens/{pages => demo}/card.njk | 9 +++--- source/screens/{pages => demo}/portal.njk | 0 source/screens/index.json | 22 +++++++++------ source/screens/index.njk | 10 +++++-- source/screens/pages/blank.njk | 2 +- source/screens/pages/error/304.njk | 2 +- source/screens/pages/error/400.njk | 2 +- source/screens/pages/error/401.njk | 2 +- source/screens/pages/error/403.njk | 2 +- source/screens/pages/error/404.njk | 2 +- source/screens/pages/error/408.njk | 2 +- source/screens/pages/error/500.njk | 2 +- source/screens/pages/error/503.njk | 2 +- source/screens/pages/maintenance.njk | 2 +- source/templates/demo/_default.njk | 2 +- source/templates/demo/_extended.njk | 2 +- .../{demo => hippie}/_maintenance.njk | 5 ++-- source/templates/hippie/macros/_nav.njk | 23 ++++++++------- .../templates/hippie/macros/_placeholder.njk | 13 +++++++++ .../templates/hippie/macros/footer-status.njk | 28 +++++++++++-------- .../partials/_head_links.njk} | 0 .../templates/hippie/partials/_head_meta.njk | 7 +++++ 22 files changed, 90 insertions(+), 51 deletions(-) rename source/screens/{pages => demo}/card.njk (93%) rename source/screens/{pages => demo}/portal.njk (100%) rename source/templates/{demo => hippie}/_maintenance.njk (91%) create mode 100644 source/templates/hippie/macros/_placeholder.njk rename source/templates/{demo/partials/_links.njk => hippie/partials/_head_links.njk} (100%) create mode 100644 source/templates/hippie/partials/_head_meta.njk diff --git a/source/screens/pages/card.njk b/source/screens/demo/card.njk similarity index 93% rename from source/screens/pages/card.njk rename to source/screens/demo/card.njk index 28ca934..9e8f93c 100644 --- a/source/screens/pages/card.njk +++ b/source/screens/demo/card.njk @@ -4,6 +4,7 @@ {% set pageClass = "html_card" %} {% extends "demo/_default.njk" %} +{% import "hippie/macros/_placeholder.njk" as ph %} {% block title %}Karte{% endblock %} @@ -42,12 +43,12 @@

Titel
and description

-

Prename Surname

+

{{ ph.name() }}

- name@domain.tld
- site.tld + {{ ph.email('card_address') }}
+ {{ ph.link('decent', 'site.tld') }} · - Street No., Postcode City

+ {{ ph.address('decent') }}

{% endblock %} diff --git a/source/screens/pages/portal.njk b/source/screens/demo/portal.njk similarity index 100% rename from source/screens/pages/portal.njk rename to source/screens/demo/portal.njk diff --git a/source/screens/index.json b/source/screens/index.json index e953b60..958c539 100644 --- a/source/screens/index.json +++ b/source/screens/index.json @@ -26,14 +26,6 @@ "href": "pages/blank.html", "text": "Blank" }, - { - "href": "pages/card.html", - "text": "Card" - }, - { - "href": "pages/portal.html", - "text": "Portal" - }, { "href": "pages/maintenance.html", "text": "Maintenance" @@ -66,5 +58,19 @@ "href": "pages/error/500.html", "text": "500" } + ], + "demo": [ + { + "href": "demo/card.html", + "text": "Card" + }, + { + "href": "demo/portal.html", + "text": "Portal" + }, + { + "href": "demo/songbook.html", + "text": "Songbook" + } ] } \ No newline at end of file diff --git a/source/screens/index.njk b/source/screens/index.njk index 4938f81..14a3f31 100644 --- a/source/screens/index.njk +++ b/source/screens/index.njk @@ -37,7 +37,6 @@

Pages

+

Demo

+ {% endblock %} diff --git a/source/screens/pages/blank.njk b/source/screens/pages/blank.njk index b68613e..5495640 100644 --- a/source/screens/pages/blank.njk +++ b/source/screens/pages/blank.njk @@ -3,7 +3,7 @@ {% set pageId = "blank" %} {% set pageClass = "h_full_view" %} -{% extends "demo/_default.njk" %} +{% extends "hippie/_default.njk" %} {% block title %}Blank{% endblock %} diff --git a/source/screens/pages/error/304.njk b/source/screens/pages/error/304.njk index 9b504b6..f452801 100644 --- a/source/screens/pages/error/304.njk +++ b/source/screens/pages/error/304.njk @@ -3,7 +3,7 @@ {% set pageId = "304" %} {% set bodyClass = "body_status" %} -{% extends "demo/_maintenance.njk" %} +{% extends "hippie/_maintenance.njk" %} {% block title %}{{ pageId }}{% endblock %} {% block head %} diff --git a/source/screens/pages/error/400.njk b/source/screens/pages/error/400.njk index d0032c1..aa13f9f 100644 --- a/source/screens/pages/error/400.njk +++ b/source/screens/pages/error/400.njk @@ -3,7 +3,7 @@ {% set pageId = "400" %} {% set bodyClass = "body_status" %} -{% extends "demo/_maintenance.njk" %} +{% extends "hippie/_maintenance.njk" %} {% block title %}{{ pageId }}{% endblock %} {% block head %} diff --git a/source/screens/pages/error/401.njk b/source/screens/pages/error/401.njk index 6a18d75..7eb424e 100644 --- a/source/screens/pages/error/401.njk +++ b/source/screens/pages/error/401.njk @@ -3,7 +3,7 @@ {% set pageId = "401" %} {% set bodyClass = "body_status" %} -{% extends "demo/_maintenance.njk" %} +{% extends "hippie/_maintenance.njk" %} {% block title %}{{ pageId }}{% endblock %} {% block head %} diff --git a/source/screens/pages/error/403.njk b/source/screens/pages/error/403.njk index c3dccc2..5223278 100644 --- a/source/screens/pages/error/403.njk +++ b/source/screens/pages/error/403.njk @@ -3,7 +3,7 @@ {% set pageId = "403" %} {% set bodyClass = "body_status" %} -{% extends "demo/_maintenance.njk" %} +{% extends "hippie/_maintenance.njk" %} {% block title %}{{ pageId }}{% endblock %} {% block head %} diff --git a/source/screens/pages/error/404.njk b/source/screens/pages/error/404.njk index 95b6beb..ff03c43 100644 --- a/source/screens/pages/error/404.njk +++ b/source/screens/pages/error/404.njk @@ -3,7 +3,7 @@ {% set pageId = "404" %} {% set bodyClass = "body_status" %} -{% extends "demo/_maintenance.njk" %} +{% extends "hippie/_maintenance.njk" %} {% block title %}{{ pageId }}{% endblock %} {% block head %} diff --git a/source/screens/pages/error/408.njk b/source/screens/pages/error/408.njk index 40275ff..5845223 100644 --- a/source/screens/pages/error/408.njk +++ b/source/screens/pages/error/408.njk @@ -3,7 +3,7 @@ {% set pageId = "408" %} {% set bodyClass = "body_status" %} -{% extends "demo/_maintenance.njk" %} +{% extends "hippie/_maintenance.njk" %} {% block title %}{{ pageId }}{% endblock %} {% block head %} diff --git a/source/screens/pages/error/500.njk b/source/screens/pages/error/500.njk index 7c94558..9ea0863 100644 --- a/source/screens/pages/error/500.njk +++ b/source/screens/pages/error/500.njk @@ -3,7 +3,7 @@ {% set pageId = "500" %} {% set bodyClass = "body_status" %} -{% extends "demo/_maintenance.njk" %} +{% extends "hippie/_maintenance.njk" %} {% block title %}{{ pageId }}{% endblock %} {% block head %} diff --git a/source/screens/pages/error/503.njk b/source/screens/pages/error/503.njk index a036838..a4c021f 100644 --- a/source/screens/pages/error/503.njk +++ b/source/screens/pages/error/503.njk @@ -3,7 +3,7 @@ {% set pageId = "503" %} {% set bodyClass = "body_status" %} -{% extends "demo/_maintenance.njk" %} +{% extends "hippie/_maintenance.njk" %} {% block title %}{{ pageId }}{% endblock %} {% block head %} diff --git a/source/screens/pages/maintenance.njk b/source/screens/pages/maintenance.njk index d5914ed..5bdae82 100644 --- a/source/screens/pages/maintenance.njk +++ b/source/screens/pages/maintenance.njk @@ -3,7 +3,7 @@ {% set pageId = "blank" %} {% set pageClass = "h_full_view" %} -{% extends "demo/_maintenance.njk" %} +{% extends "hippie/_maintenance.njk" %} {% block title %}Maintenance{% endblock %} diff --git a/source/templates/demo/_default.njk b/source/templates/demo/_default.njk index 1f67848..aac357f 100644 --- a/source/templates/demo/_default.njk +++ b/source/templates/demo/_default.njk @@ -21,7 +21,7 @@ logPerf('HEAD start :: Debugging performance...', debugOn); - {% include "demo/partials/_links.njk" %} + {% include "hippie/partials/_head_links.njk" %} {% block links %} {# #} {# #} diff --git a/source/templates/demo/_extended.njk b/source/templates/demo/_extended.njk index 39fdcb4..17aa1b0 100644 --- a/source/templates/demo/_extended.njk +++ b/source/templates/demo/_extended.njk @@ -21,7 +21,7 @@ logPerf('HEAD start :: Debugging performance...', debugOn); - {% include "demo/partials/_links.njk" %} + {% include "hippie/partials/_head_links.njk" %} {% block links %} diff --git a/source/templates/demo/_maintenance.njk b/source/templates/hippie/_maintenance.njk similarity index 91% rename from source/templates/demo/_maintenance.njk rename to source/templates/hippie/_maintenance.njk index af00cb7..0635f17 100644 --- a/source/templates/demo/_maintenance.njk +++ b/source/templates/hippie/_maintenance.njk @@ -6,10 +6,9 @@ {% block head %} - {% block title %}{% endblock %} - - HIPPIE + {% block title %}{% endblock %}{{ hippie.titlePostfix }} - {% include "demo/partials/_meta.njk" %} + {% include "hippie/partials/_head_meta.njk" %} {% block meta %}{% endblock %} {% block links %} diff --git a/source/templates/hippie/macros/_nav.njk b/source/templates/hippie/macros/_nav.njk index 0178835..4f04ad4 100644 --- a/source/templates/hippie/macros/_nav.njk +++ b/source/templates/hippie/macros/_nav.njk @@ -1,10 +1,13 @@ - -{% macro main(data, active='') %} - -{% endmacro %} +{% macro main(data, active = '') %} + +{% endmacro %} \ No newline at end of file diff --git a/source/templates/hippie/macros/_placeholder.njk b/source/templates/hippie/macros/_placeholder.njk new file mode 100644 index 0000000..d82e4ff --- /dev/null +++ b/source/templates/hippie/macros/_placeholder.njk @@ -0,0 +1,13 @@ +{% macro email(class='', text='name@domain.tld') %} +{{ text }} +{# {{ 'name@domain.tld' | urlize | safe }} #} +{% endmacro %} +{% macro link(class='', text='domain.tld', href='http://domain.internal') %} +{{ text }} +{% endmacro %} +{% macro name(class='', text='Prename Surname') %} +{{ text }} +{% endmacro %} +{% macro address(class='', text='Street No., Postcode City') %} +{{ text }} +{% endmacro %} diff --git a/source/templates/hippie/macros/footer-status.njk b/source/templates/hippie/macros/footer-status.njk index 3f2e790..6668607 100644 --- a/source/templates/hippie/macros/footer-status.njk +++ b/source/templates/hippie/macros/footer-status.njk @@ -1,13 +1,17 @@ - -{% macro footer(email='admin@domain.tld', app='Application', version='ver.s.ion', system='System Name', domain='domain.tld:port', type) %} +{% macro footer(email = 'admin@domain.tld', app = 'Application', version = 'ver.s.ion', system = 'System Name', domain = 'domain.tld:port', type) %} -{% if not type or type == 'status' %} -
-
Kontakt: {{ email }} * Server: {{ app }}/{{ version }} ({{ system }}) * Domain: {{ domain }}
-
-{% else %} -
-

Platzhalter unten fixiert

-
-{% endif %} -{% endmacro %} + {% if not type or type == 'status' %} +
+
Kontakt: + {{ email }} + * Server: + {{ app }}/{{ version }} + ({{ system }}) * Domain: + {{ domain }}
+
+ {% else %} +
+

Platzhalter unten fixiert

+
+ {% endif %} +{% endmacro %} \ No newline at end of file diff --git a/source/templates/demo/partials/_links.njk b/source/templates/hippie/partials/_head_links.njk similarity index 100% rename from source/templates/demo/partials/_links.njk rename to source/templates/hippie/partials/_head_links.njk diff --git a/source/templates/hippie/partials/_head_meta.njk b/source/templates/hippie/partials/_head_meta.njk new file mode 100644 index 0000000..22c28a5 --- /dev/null +++ b/source/templates/hippie/partials/_head_meta.njk @@ -0,0 +1,7 @@ + + + + + + + From a5f07468e79a4b27eb72c94b8412a7dfe4fdba6e Mon Sep 17 00:00:00 2001 From: sthag Date: Fri, 9 Aug 2024 20:03:07 +0200 Subject: [PATCH 3/5] feat: enable markdown template format --- .eleventy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.eleventy.js b/.eleventy.js index da25e16..490cc66 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -36,6 +36,6 @@ module.exports = function (eleventyConfig) { }, markdownTemplateEngine: "njk", htmlTemplateEngine: "njk", - templateFormats: ["html", "njk"] + templateFormats: ["html", "njk", "md"] } }; From c55c1c9b66e58f64b489d889829196a4c8124392 Mon Sep 17 00:00:00 2001 From: sthag Date: Fri, 9 Aug 2024 20:06:00 +0200 Subject: [PATCH 4/5] style: typos --- source/screens/components.njk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/screens/components.njk b/source/screens/components.njk index ec61f91..e1c2ab1 100644 --- a/source/screens/components.njk +++ b/source/screens/components.njk @@ -39,7 +39,7 @@

Übersicht aller Elemente

Es werden alle grundlegenden Elemente sowie ihre gestalteten Varianten angegeben. Die Elemente sind in Gruppen eingeteilt, die auch das W3Consortium (www.w3.org/TR/2017/REC-html52-20171214/index.html#contents) verwendet.

-

Zu jedem Element werden alle Attribute aufgelistet und die Umsetzung im HTML Dokument als Emmet Syntax dargestellt.

+

Zu jedem Element werden alle Attribute aufgelistet und die Umsetzung im HTML-Dokument als Emmet-Syntax dargestellt.

Bereiche

From be425e8be5723da9b5ee2081beacb040b1132e46 Mon Sep 17 00:00:00 2001 From: sthag Date: Sat, 10 Aug 2024 15:25:41 +0200 Subject: [PATCH 5/5] feat: change log output and template structure - new global variable debugMode - demo templates are now based on hippie defaults joined with template inheritance - add log macros - new function logAdd() - log uses global state --- .eleventy.js | 3 +- source/screens/basics.njk | 11 ++- source/screens/components.njk | 5 +- source/screens/demo/card.njk | 3 +- source/screens/demo/portal.njk | 2 +- source/screens/index.njk | 9 ++- source/screens/introduction.njk | 13 ++-- source/screens/layouts.njk | 5 +- source/screens/pages/blank.njk | 4 ++ source/templates/demo/_default.njk | 52 -------------- source/templates/demo/_demo.njk | 18 +++++ source/templates/demo/_docs.njk | 23 +++++++ source/templates/demo/_extended.njk | 67 ------------------- source/templates/demo/partials/_meta.njk | 2 +- source/templates/hippie/_default.njk | 41 ++++++++++++ source/templates/hippie/_main.njk | 50 ++++++++++++++ source/templates/hippie/macros/_log.njk | 24 +++++++ .../templates/hippie/partials/_head_links.njk | 2 +- .../templates/hippie/partials/_head_meta.njk | 2 +- .../hippie/partials/_head_script.njk | 25 +++++-- 20 files changed, 206 insertions(+), 155 deletions(-) delete mode 100644 source/templates/demo/_default.njk create mode 100644 source/templates/demo/_demo.njk create mode 100644 source/templates/demo/_docs.njk delete mode 100644 source/templates/demo/_extended.njk create mode 100644 source/templates/hippie/_default.njk create mode 100644 source/templates/hippie/_main.njk create mode 100644 source/templates/hippie/macros/_log.njk diff --git a/.eleventy.js b/.eleventy.js index 490cc66..ccca65a 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -12,7 +12,8 @@ module.exports = function (eleventyConfig) { pageBase: './', brand: 'hippie', titlePrefix: '', - titlePostfix: ' - HIPPIE' + titlePostfix: ' - HIPPIE', + debugMode: true }); eleventyConfig.addPassthroughCopy({"source/art/images": "art"}); diff --git a/source/screens/basics.njk b/source/screens/basics.njk index 21f455f..f31fedb 100644 --- a/source/screens/basics.njk +++ b/source/screens/basics.njk @@ -1,8 +1,8 @@ - + {% set pageBase = "../" %} {% set pageId = "basics" %} -{% extends "demo/_extended.njk" %} +{% extends "demo/_docs.njk" %} {% block title %}Grundlagen{% endblock %} {% block head %} @@ -959,12 +959,11 @@ - {% endblock %} \ No newline at end of file diff --git a/source/screens/components.njk b/source/screens/components.njk index e1c2ab1..7b00a16 100644 --- a/source/screens/components.njk +++ b/source/screens/components.njk @@ -2,7 +2,7 @@ {% set pageBase = "../" %} {% set pageId = "components" %} -{% extends "demo/_extended.njk" %} +{% extends "demo/_docs.njk" %} {% block title %}Komponenten{% endblock %} {% block head %} @@ -69,7 +69,8 @@ - + {{ log.asset(true) }} + {{ log.log('Assets loaded.', assetsLoaded) }} - - {% endblock %} \ No newline at end of file diff --git a/source/screens/introduction.njk b/source/screens/introduction.njk index d35bec6..aeea393 100644 --- a/source/screens/introduction.njk +++ b/source/screens/introduction.njk @@ -1,8 +1,8 @@ - + {% set pageBase = "../" %} {% set pageId = "intro" %} -{% extends "demo/_extended.njk" %} +{% extends "demo/_docs.njk" %} {% block title %}Einführung{% endblock %} {% block head %} @@ -23,8 +23,6 @@

…

- - {% endblock %} {% block script %} @@ -34,12 +32,11 @@ - {% endblock %} \ No newline at end of file diff --git a/source/screens/layouts.njk b/source/screens/layouts.njk index 253f66e..4bd7966 100644 --- a/source/screens/layouts.njk +++ b/source/screens/layouts.njk @@ -2,7 +2,7 @@ {% set pageBase = "../" %} {% set pageId = "layouts" %} -{% extends "demo/_extended.njk" %} +{% extends "demo/_docs.njk" %} {% block title %}Gestaltungen{% endblock %} {% block head %} @@ -322,7 +322,8 @@ - + {{ log.asset(true) }} + {{ log.log('Assets loaded.', assetsLoaded) }} - - {% include "hippie/partials/_head_links.njk" %} - {% block links %} - {# #} - {# #} - - {% endblock %} - - {% endblock %} - - - - - {% block body %}{% endblock %} - - {% block script %} - - - {% endblock %} - - - \ No newline at end of file diff --git a/source/templates/demo/_demo.njk b/source/templates/demo/_demo.njk new file mode 100644 index 0000000..afc2aae --- /dev/null +++ b/source/templates/demo/_demo.njk @@ -0,0 +1,18 @@ + +{% extends "hippie/_default.njk" %} + +{% block meta %} + {% include "demo/partials/_meta.njk" %} + {# #} +{% endblock %} + +{% block links %} + {{ super() }} + {# #} + {# #} +{% endblock %} + +{% block script %} + {{ super() }} + +{% endblock %} \ No newline at end of file diff --git a/source/templates/demo/_docs.njk b/source/templates/demo/_docs.njk new file mode 100644 index 0000000..97f765d --- /dev/null +++ b/source/templates/demo/_docs.njk @@ -0,0 +1,23 @@ + +{% extends "hippie/_main.njk" %} + +{% block meta %} + {% include "demo/partials/_meta.njk" %} + {# #} +{% endblock %} + +{% block links %} + {{ super() }} + + + + + + + +{% endblock %} + +{% block script %} + {{ super() }} + +{% endblock %} diff --git a/source/templates/demo/_extended.njk b/source/templates/demo/_extended.njk deleted file mode 100644 index 17aa1b0..0000000 --- a/source/templates/demo/_extended.njk +++ /dev/null @@ -1,67 +0,0 @@ - - - - - - - {% block head %} - - {% block title %}{% endblock %} - - HIPPIE - - {% include "demo/partials/_meta.njk" %} - {% block meta %}{% endblock %} - - {% include "hippie/partials/_head_script.njk" %} - - - {% include "hippie/partials/_head_links.njk" %} - {% block links %} - - - - - - - - - {% endblock %} - - {% endblock %} - - - - - {% include "hippie/partials/_body_hover.njk" %} -
- {% include "hippie/partials/_header.njk" %} - -
- {% block main %}{% endblock %} -
- - {% include "hippie/partials/_footer.njk" %} -
- - {% block script %} - - - {# #} - {% endblock %} - - - \ No newline at end of file diff --git a/source/templates/demo/partials/_meta.njk b/source/templates/demo/partials/_meta.njk index dd00970..1253aaa 100644 --- a/source/templates/demo/partials/_meta.njk +++ b/source/templates/demo/partials/_meta.njk @@ -1,6 +1,6 @@ - + diff --git a/source/templates/hippie/_default.njk b/source/templates/hippie/_default.njk new file mode 100644 index 0000000..bdaf5ed --- /dev/null +++ b/source/templates/hippie/_default.njk @@ -0,0 +1,41 @@ + +{% import "hippie/macros/_log.njk" as log %} + + + + + + + {% block head %} + + {{ hippie.titlePrefix }} + {% block title %}{% endblock %}{{ hippie.titlePostfix }} + + {% block meta %} + {% include "hippie/partials/_head_meta.njk" %} + {% endblock %} + + {% include "hippie/partials/_head_script.njk" %} + {# {{ log.debug(true) }} #} + {{ log.start() }} + + {% block links %} + {% include "hippie/partials/_head_links.njk" %} + + {% endblock %} + + {{ log.log('HEAD end :: Links parsed, starting to load.') }} + {% endblock %} + + + + {{ log.log('BODY start') }} + {% block body %}{% endblock %} + + {% block script %} + {{ log.log('BODY :: Loading script assets...') }} + {% endblock %} + + {{ log.log('BODY end :: Page script might still be loading.') }} + + \ No newline at end of file diff --git a/source/templates/hippie/_main.njk b/source/templates/hippie/_main.njk new file mode 100644 index 0000000..20ccda5 --- /dev/null +++ b/source/templates/hippie/_main.njk @@ -0,0 +1,50 @@ + +{% import "hippie/macros/_log.njk" as log %} + + + + + + + {% block head %} + + {{ hippie.titlePrefix }} + {% block title %}{% endblock %}{{ hippie.titlePostfix }} + + {% block meta %} + {% include "hippie/partials/_head_meta.njk" %} + {% endblock %} + + {% include "hippie/partials/_head_script.njk" %} + {{ log.debug(hippie.debugMode, true) }} + {{ log.start() }} + + {% block links %} + {% include "hippie/partials/_head_links.njk" %} + + {% endblock %} + + {{ log.log('HEAD end :: Links parsed, starting to load.') }} + {% endblock %} + + + + {{ log.log('BODY start') }} + {% include "hippie/partials/_body_hover.njk" %} +
+ {% include "hippie/partials/_header.njk" %} + +
+ {% block main %}{% endblock %} +
+ + {% include "hippie/partials/_footer.njk" %} +
+ + {% block script %} + {{ log.log('BODY :: Loading script assets...') }} + {% endblock %} + + {{ log.log('BODY end :: Page script might still be loading.') }} + + \ No newline at end of file diff --git a/source/templates/hippie/macros/_log.njk b/source/templates/hippie/macros/_log.njk new file mode 100644 index 0000000..98ceaa3 --- /dev/null +++ b/source/templates/hippie/macros/_log.njk @@ -0,0 +1,24 @@ +{% macro start() %} + +{% endmacro %} +{% macro log(msg, arg = '') %} + +{% endmacro %} +{% macro debug(state = false, display = false, assets = false) %} + {# {{ set hippie.debugMode = state }} #} + +{% endmacro %} +{% macro asset(state = false) %} + +{% endmacro %} \ No newline at end of file diff --git a/source/templates/hippie/partials/_head_links.njk b/source/templates/hippie/partials/_head_links.njk index c95a39b..b7afb2d 100644 --- a/source/templates/hippie/partials/_head_links.njk +++ b/source/templates/hippie/partials/_head_links.njk @@ -1,4 +1,4 @@ - + {# #} diff --git a/source/templates/hippie/partials/_head_meta.njk b/source/templates/hippie/partials/_head_meta.njk index 22c28a5..38c3b82 100644 --- a/source/templates/hippie/partials/_head_meta.njk +++ b/source/templates/hippie/partials/_head_meta.njk @@ -1,4 +1,4 @@ - + diff --git a/source/templates/hippie/partials/_head_script.njk b/source/templates/hippie/partials/_head_script.njk index e00bacc..ccb6ddc 100644 --- a/source/templates/hippie/partials/_head_script.njk +++ b/source/templates/hippie/partials/_head_script.njk @@ -1,8 +1,8 @@ \ No newline at end of file