diff --git a/.eleventy.js b/.eleventy.js index 48791f7..74e76be 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -14,20 +14,10 @@ export default async function (eleventyConfig) { // trimTagRight : true, }); - eleventyConfig.setNunjucksEnvironmentOptions({ - // throwOnUndefined: true, - trimBlocks: true - }); - eleventyConfig.addGlobalData('permalink', () => { return (data) => `${data.page.filePathStem}.${data.page.outputFileExtension}`; }); - - let demoMode = false; - let pageBase = demoMode ? './demo/' : './'; - eleventyConfig.addGlobalData('hippie', { - pageBase: pageBase, brand: 'hippie', titlePrefix: '', titlePostfix: ' - HIPPIE', @@ -58,7 +48,7 @@ export default async function (eleventyConfig) { return `${text}`; }); - eleventyConfig.addPairedShortcode("brand", function (content, attrClass = 'brand', direction = 'first') { + eleventyConfig.addPairedShortcode('brand', function (content, attrClass = 'brand', direction = 'first') { const logo = ` + {% render 'hippie/partials/gate-list', + name: 'Tor mit Symbol und Liste', + url: '../demo', + image: image, + links: links + %} + {% render 'hippie/partials/gate-simple', name: 'Tor', url: '../demo' %} + +{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/examples/portal.njk b/source/screens/demo/examples/portal.njk deleted file mode 100644 index 68268c7..0000000 --- a/source/screens/demo/examples/portal.njk +++ /dev/null @@ -1,41 +0,0 @@ ---- -title: Portal -tags: - - demoExample ---- -{% set pageId = page.fileSlug %} -{% set bodyClass = "body_portal" %} - -{% extends "demo/_default.njk" %} -{% import "hippie/macros/_gate.njk" as gate %} - -{% block title %}{{ title }} -{% endblock %} - -{% block head %} - {{ super() }} -{% endblock %} - -{% block body %} - -
- {{ gate.list( - 'Tor mit Symbol und Liste', - '../demo', { - src: '/art/flag_websafe_128x80.gif', - alt: 'Flag of Interaktionsweise' - }, [ - { - name: '1', - href: 'http://domain.tld', - img: '../art/bullet.gif' - }, { - name: 'Zwei', - href: 'http://domain.tld', - img: '../art/bullet.gif' - } - ] - ) }} - {{ gate.simple('Tor', '../demo') }} -
-{% endblock %} \ No newline at end of file diff --git a/source/screens/demo/layouts.liquid b/source/screens/demo/layouts.liquid index 37da17e..958c545 100644 --- a/source/screens/demo/layouts.liquid +++ b/source/screens/demo/layouts.liquid @@ -15,7 +15,7 @@ order: 4

Die Elemente werden fortlaufend komplexer

-

Bereiche (sections)

+

Bereiche (sections)

section

section.overflow>div.float_space_left>img^p+p>br+a.lineLink
@@ -169,46 +169,9 @@ order: 4 - -

Interaktiv (interactive)

-

input

-
- - - - - -
-

form

-
-

Show me a - - Sorted by - - - - Matching - - -

-
- -

Gruppierung (grouping)

+
+
+

Gruppierung (grouping)

p

p.txt_right+p.txt_center+p.txt_left

Rechts

@@ -248,8 +211,15 @@ order: 4

Eingerückter Inhalt

- -

Tabellen

+
+
+

Eingebettet

+
+ {% render 'hippie/partials/placeholder-flag.liquid', type: '', width: '128', desc: 'Fahne von Interaktionsweise' %} +
+
+
+

Tabellen (tabular data)

table.link>thead>tr>th{ }+th{ab / zy}+th{neu / alt}^^(tbody>tr>td.icon[rowspan="2"]>img[width=16 height=16]^+td.link>span{name}+a[target=_blank]{url}^+td[rowspan="2"]{yyy-mm-dd}^tr>td.text>div.shorten{beschreibung})*2
@@ -290,12 +260,57 @@ order: 4
- -

Eingebettet

-
- {% render 'hippie/partials/placeholder-flag.liquid', type: '', width: '128', desc: 'Fahne von Interaktionsweise' %} +
+
+

Formulare (forms)

+

form

+
+

Show me a + + Sorted by + + + + Matching + + +

+
+ +
+
+

Anmeldung

+ + +
+
+

input

+
+ + + + +
+
+

Interaktiv (interactive)

+
{% endblock %} diff --git a/source/style/demo.scss b/source/style/demo.scss index 43d9cbd..85090ad 100644 --- a/source/style/demo.scss +++ b/source/style/demo.scss @@ -16,4 +16,5 @@ @use "modules/start"; @use "modules/clock"; @use "modules/game"; +@use "modules/login"; // @use "modules/YOUR-MODULE/YOUR-FILES"; diff --git a/source/style/modules/_login.scss b/source/style/modules/_login.scss new file mode 100644 index 0000000..3382d86 --- /dev/null +++ b/source/style/modules/_login.scss @@ -0,0 +1,28 @@ +@use "sass:color"; +@use "../hippie-style/hippie"; + +form[name="login"] { + display: flex; + align-items: center; + justify-content: center; + + & > div { + padding: hippie.$space_double; + background-color: color.adjust(hippie.basic_color(echo), $alpha: -0.4); + + p { + margin-top: 0; + color: hippie.$color_brightest; + } + + & > input { + display: block; + width: 100%; + margin-inline: 0; + } + + input:first-of-type { + margin-bottom: hippie.$space_basic; + } + } +} \ No newline at end of file diff --git a/source/templates/demo/_default.njk b/source/templates/demo/_default.njk deleted file mode 100644 index e9b46de..0000000 --- a/source/templates/demo/_default.njk +++ /dev/null @@ -1,19 +0,0 @@ - -{% 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/_main.njk b/source/templates/demo/_main.njk deleted file mode 100644 index c2797e8..0000000 --- a/source/templates/demo/_main.njk +++ /dev/null @@ -1,21 +0,0 @@ - -{% extends "hippie/_main.njk" %} - -{% block meta %} - {% include "demo/partials/_meta.njk" %} - -{% endblock %} - -{% block links %} - {{ super() }} - {% if hippie.legacyMode %} - - - - - {% endif %} - - - - -{% endblock %} \ No newline at end of file diff --git a/source/templates/demo/partials/_meta.njk b/source/templates/demo/partials/_meta.njk deleted file mode 100644 index 1253aaa..0000000 --- a/source/templates/demo/partials/_meta.njk +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - -{# #} -{# #} diff --git a/source/templates/demo/partials/exp-colors.njk b/source/templates/demo/partials/exp-colors.njk deleted file mode 100644 index 286b30f..0000000 --- a/source/templates/demo/partials/exp-colors.njk +++ /dev/null @@ -1,7 +0,0 @@ - -{# var colors = [{name: "alpha", class: "alpha_color"}] #} - -{% set cls = cycler("odd", "even") %} -{% for row in rows %} -
{{ row.name }}
-{% endfor %} diff --git a/source/templates/hippie/_app.njk b/source/templates/hippie/_app.njk deleted file mode 100755 index f0703d2..0000000 --- a/source/templates/hippie/_app.njk +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - {% block head %} - {{ hippie.titlePrefix }} - {%- block title %}{% endblock %}{{ hippie.titlePostfix }} - - {% block meta %} - {% include "hippie/partials/_head_meta.njk" %} - - {% endblock %} - - {% block links %}{% endblock %} - - {% endblock %} - - - - {% block body %}{% endblock %} - - {% block script %} - - - - - - - {% endblock %} - - \ No newline at end of file diff --git a/source/templates/hippie/_app_frame.njk b/source/templates/hippie/_app_frame.njk deleted file mode 100755 index 35ddd64..0000000 --- a/source/templates/hippie/_app_frame.njk +++ /dev/null @@ -1,19 +0,0 @@ - -{% extends "hippie/_app.njk" %} -{% import "hippie/macros/_io.njk" as io %} - -{% block head %} - {{ super() }} -{% endblock %} - -{% block title %}{{ title }}{% endblock %} - -{% block links %} - {{ super() }} - - -{% endblock %} - -{% block script %} - {{ super() }} -{% endblock %} \ No newline at end of file diff --git a/source/templates/hippie/_default.njk b/source/templates/hippie/_default.njk deleted file mode 100644 index 8756e7f..0000000 --- a/source/templates/hippie/_default.njk +++ /dev/null @@ -1,41 +0,0 @@ - -{# {% if hippie.debugMode %} #} - {% import "hippie/macros/_log.njk" as log %} -{# {% endif %} #} - - - - - - - {% 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 deleted file mode 100644 index 3934cc1..0000000 --- a/source/templates/hippie/_main.njk +++ /dev/null @@ -1,73 +0,0 @@ - -{% 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_nav.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/_footer.njk b/source/templates/hippie/macros/_footer.njk deleted file mode 100644 index 4b27499..0000000 --- a/source/templates/hippie/macros/_footer.njk +++ /dev/null @@ -1,23 +0,0 @@ -{% macro status(email = 'admin@domain.tld', app = 'Application', version = 'ver.s.ion', system = 'System Name', domain = 'domain.tld:port') %} - -{% endmacro %} - -{% macro pinned(pos = 'bottom') %} - -{% endmacro %} - -{% macro main() %} - -{% endmacro %} \ No newline at end of file diff --git a/source/templates/hippie/macros/_gate.njk b/source/templates/hippie/macros/_gate.njk deleted file mode 100644 index 3ae1247..0000000 --- a/source/templates/hippie/macros/_gate.njk +++ /dev/null @@ -1,30 +0,0 @@ -{% macro list(name, url, image, links) %} -
-
-

- {{ name }} -

- - {{ image.alt }} - - {% if links %} - - {% endif %} -
-
-{% endmacro %} -{% macro simple(name, url) %} -
-
-

- {{ name }} -

-
-
-{% endmacro %} \ No newline at end of file diff --git a/source/templates/hippie/macros/_header.njk b/source/templates/hippie/macros/_header.njk deleted file mode 100644 index e074db7..0000000 --- a/source/templates/hippie/macros/_header.njk +++ /dev/null @@ -1,30 +0,0 @@ -{% macro main() %} -
-
-
-{% endmacro %} - -{% macro status(hippie, page) %} - {% import "hippie/macros/_state.njk" as state %} -
-

- {{ hippie.brand | upper }} -

- -
-

{{ state.coord("log")}} - / - {{ state.date("date")}} - / - {{ state.time("time")}}

-
-
-{% endmacro %} \ No newline at end of file diff --git a/source/templates/hippie/macros/_io.njk b/source/templates/hippie/macros/_io.njk deleted file mode 100644 index f9a7300..0000000 --- a/source/templates/hippie/macros/_io.njk +++ /dev/null @@ -1,49 +0,0 @@ -{% macro frameHeader(title) %} -
- - -
-{% endmacro %} - -{% macro frameFooter(title) %} - -{% endmacro %} - -{% macro statusBar(title) %} - -{% endmacro %} \ No newline at end of file diff --git a/source/templates/hippie/macros/_log.njk b/source/templates/hippie/macros/_log.njk deleted file mode 100644 index e469527..0000000 --- a/source/templates/hippie/macros/_log.njk +++ /dev/null @@ -1,24 +0,0 @@ -{% 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/macros/_nav.njk b/source/templates/hippie/macros/_nav.njk deleted file mode 100644 index 4fc5d93..0000000 --- a/source/templates/hippie/macros/_nav.njk +++ /dev/null @@ -1,13 +0,0 @@ -{% 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 deleted file mode 100644 index f3c2fa1..0000000 --- a/source/templates/hippie/macros/_placeholder.njk +++ /dev/null @@ -1,100 +0,0 @@ -{% macro email(class = '', text = '', address = 'name@domain.tld') %} - {% if text === '' %} - {% set text = address %} - {% endif %} - - {{ text }} - {# {{ 'name@domain.tld' | urlize | safe }} #} -{% endmacro %} - -{% macro link(class = '', text = 'domain.tld', href = 'http://domain.internal') %} - {{ text }} -{% endmacro %} - -{% macro name(class = '', text = 'Vorname Nachname') %} - {{ text }} -{% endmacro %} - -{% macro address(class = '', text = 'Straße Nr., PLZ Ort') %} - {{ text }} -{% endmacro %} - -{% macro phone(class = '', text = '+49 (0)101 1337 48') %} - {{ text }} -{% endmacro %} - -{% macro brand(class = '', name = 'Marke') %} -
- {# Brand logo #} - - - - - - - -

{{ name }}

-
-{% endmacro %} - -{% macro flag(type = '', src = '', id = '', desc = 'Fahne von Interaktionsweise', width = '128') %} - {% set height = width / 1.6 %} - {% if type === 'svg' or type === '' %} - - {# - - - - - - - - - - - #} - {% if desc !== '' %} - {{ desc }} - {% endif %} - - - - - - - - - - - {% elif type === 'img' %} - {% if src === 'file' %} - - - {{ desc }} - - {% else %} - {{ desc }} - {% endif %} - {% endif %} -{% endmacro %} \ No newline at end of file diff --git a/source/templates/hippie/macros/_song.njk b/source/templates/hippie/macros/_song.njk deleted file mode 100644 index 28c83d4..0000000 --- a/source/templates/hippie/macros/_song.njk +++ /dev/null @@ -1,12 +0,0 @@ -{% macro simple(index, data, content) %} -
-
-

{{ data.title }}

-
{{ data.releaseDate }}
-

{{ data.description }}

-
- {# 
{{ content }}
#} - {{ content | safe }} - -
-{% endmacro %} \ No newline at end of file diff --git a/source/templates/hippie/macros/_state.njk b/source/templates/hippie/macros/_state.njk deleted file mode 100644 index ef1f34d..0000000 --- a/source/templates/hippie/macros/_state.njk +++ /dev/null @@ -1,16 +0,0 @@ -{% macro coord(id, text = 'X: #, Y: ##') %} - {{ text }} -{% endmacro %} - -{% macro time(id, text = '00:00:00', postfix = ' Uhr') %} - {{ text }}{{ postfix }} -{% endmacro %} - -{% macro date(id) %} - - Wochentag, - ##. - Monat - #### - -{% endmacro %} \ No newline at end of file diff --git a/source/templates/hippie/macros/top-macro.njk b/source/templates/hippie/macros/top-macro.njk deleted file mode 100644 index 3b681c0..0000000 --- a/source/templates/hippie/macros/top-macro.njk +++ /dev/null @@ -1,5 +0,0 @@ -{% macro field(name, value='', type='text') %} -
- -
-{% endmacro %} diff --git a/source/templates/hippie/partials/_body_nav.njk b/source/templates/hippie/partials/_body_nav.njk deleted file mode 100644 index 870d2a6..0000000 --- a/source/templates/hippie/partials/_body_nav.njk +++ /dev/null @@ -1,34 +0,0 @@ - -
- -
-{#
-? -
#} \ No newline at end of file diff --git a/source/templates/hippie/partials/_footer.njk b/source/templates/hippie/partials/_footer.njk deleted file mode 100644 index 3b56531..0000000 --- a/source/templates/hippie/partials/_footer.njk +++ /dev/null @@ -1,3 +0,0 @@ - -{% import "hippie/macros/_footer.njk" as footer %} -{{ footer.main() }} \ No newline at end of file diff --git a/source/templates/hippie/partials/_head_links.njk b/source/templates/hippie/partials/_head_links.njk deleted file mode 100644 index c95a39b..0000000 --- a/source/templates/hippie/partials/_head_links.njk +++ /dev/null @@ -1,4 +0,0 @@ - -{# #} - - diff --git a/source/templates/hippie/partials/_head_meta.njk b/source/templates/hippie/partials/_head_meta.njk deleted file mode 100644 index a21d094..0000000 --- a/source/templates/hippie/partials/_head_meta.njk +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/source/templates/hippie/partials/_head_script.njk b/source/templates/hippie/partials/_head_script.njk deleted file mode 100644 index 7002ee5..0000000 --- a/source/templates/hippie/partials/_head_script.njk +++ /dev/null @@ -1,114 +0,0 @@ - - \ No newline at end of file diff --git a/source/templates/hippie/partials/_header.njk b/source/templates/hippie/partials/_header.njk deleted file mode 100644 index 2531200..0000000 --- a/source/templates/hippie/partials/_header.njk +++ /dev/null @@ -1,3 +0,0 @@ - -{% import "hippie/macros/_header.njk" as header %} -{{ header.main() }} \ No newline at end of file diff --git a/source/templates/hippie/partials/gate-list.liquid b/source/templates/hippie/partials/gate-list.liquid new file mode 100644 index 0000000..8c5fdea --- /dev/null +++ b/source/templates/hippie/partials/gate-list.liquid @@ -0,0 +1,19 @@ +
+
+

+ {{ name }} +

+ + {{ image.alt }} + + {% if links %} + + {% endif %} +
+
diff --git a/source/templates/hippie/partials/gate-simple.liquid b/source/templates/hippie/partials/gate-simple.liquid new file mode 100644 index 0000000..9d0b54e --- /dev/null +++ b/source/templates/hippie/partials/gate-simple.liquid @@ -0,0 +1,7 @@ +
+
+

+ {{ name }} +

+
+
\ No newline at end of file