From c77bcd8bdccdcd224247c96ac60b1d04ff56ac82 Mon Sep 17 00:00:00 2001
From: sthag <sthag@interaktionsweise.de>
Date: Mon, 27 Oct 2025 20:51:17 +0100
Subject: [PATCH] feat: Replace ui drag screen with liquid template

- Recreate io macros as liquid partials
- Add app template based on default
- Drag screen uses app.liquid layout instead of _app_frame.njk
---
 source/screens/demo/examples/ui/drag.liquid   | 48 ++++++++++++++++++
 source/screens/demo/examples/ui/drag.njk      | 50 -------------------
 source/templates/hippie/app.liquid            | 40 +++++++++++++++
 .../hippie/partials/frame-header.liquid       | 20 ++++++++
 .../hippie/partials/frame-mode.liquid         | 10 ++++
 .../hippie/partials/frame-status.liquid       | 11 ++++
 6 files changed, 129 insertions(+), 50 deletions(-)
 create mode 100755 source/screens/demo/examples/ui/drag.liquid
 delete mode 100755 source/screens/demo/examples/ui/drag.njk
 create mode 100644 source/templates/hippie/app.liquid
 create mode 100644 source/templates/hippie/partials/frame-header.liquid
 create mode 100644 source/templates/hippie/partials/frame-mode.liquid
 create mode 100644 source/templates/hippie/partials/frame-status.liquid

diff --git a/source/screens/demo/examples/ui/drag.liquid b/source/screens/demo/examples/ui/drag.liquid
new file mode 100755
index 0000000..aeceed7
--- /dev/null
+++ b/source/screens/demo/examples/ui/drag.liquid
@@ -0,0 +1,48 @@
+---
+title: Drag
+tags:
+- ui
+---
+{% layout "hippie/app.liquid" %}
+
+{% block body %}
+<header class="io pos_fix pin_top pin_right pin_left">
+	<button data-action="add">Add</button>
+</header>
+<div id="space"></div>
+<div>
+	<div id="test">
+		<div class="body_frame">
+			{% render 'hippie/partials/frame-header.liquid' %}
+			<main></main>
+			{% render 'hippie/partials/frame-mode.liquid' %}
+		</div>
+	</div>
+</div>
+{% endblock %}
+
+{%- block script %}
+<script src="{{ pageBase }}js/_ui.js"></script>
+<script>
+	// Get the space element
+	const space = document.getElementById('space');
+	const add = document.querySelector('[data-action=add]');
+	const test = document.getElementById('test');
+
+	// Add event listener to the add space button
+	add.addEventListener('click', () => {
+		const newDiv = new NewDiv(100, 100, 100, 100, getRandomColor());
+		newDiv.createDiv();
+		newDiv.appendToFrame(space);
+	});
+
+	// Create a new NewDiv instance
+	const newDiv = new NewDiv(100, 100, 200, 200, '#000');
+	newDiv.createDiv();
+	newDiv.appendToFrame(space);
+
+	const explorer = new NewDiv(256, 128, 800, 600, '#fff', test);
+	explorer.createDiv();
+	explorer.appendToFrame(space);
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/source/screens/demo/examples/ui/drag.njk b/source/screens/demo/examples/ui/drag.njk
deleted file mode 100755
index ecd3001..0000000
--- a/source/screens/demo/examples/ui/drag.njk
+++ /dev/null
@@ -1,50 +0,0 @@
----
-title: Drag
-tags:
-  - ui
----
-{% set pageId = page.fileSlug %}
-
-{% extends "hippie/_app_frame.njk" %}
-
-{% block body %}
-  <header class="io pos_fix pin_top pin_right pin_left">
-    <button data-action="add">Add</button>
-  </header>
-  <div id="space"></div>
-  <div>
-    <div id="test">
-      <div class="body_frame">
-        {{ io.frameHeader('title-bar') }}
-        <main></main>
-        {{ io.frameFooter('mode-bar') }}
-      </div>
-    </div>
-  </div>
-{% endblock %}
-
-{%- block script %}
-  <script src="{{ pageBase }}js/_ui.js"></script>
-  <script>
-    // Get the space element
-    const space = document.getElementById('space');
-    const add = document.querySelector('[data-action=add]');
-    const test = document.getElementById('test');
-
-    // Add event listener to the add space button
-    add.addEventListener('click', () => {
-      const newDiv = new NewDiv(100, 100, 100, 100, getRandomColor());
-      newDiv.createDiv();
-      newDiv.appendToFrame(space);
-    });
-
-    // Create a new NewDiv instance
-    const newDiv = new NewDiv(100, 100, 200, 200, '#000');
-    newDiv.createDiv();
-    newDiv.appendToFrame(space);
-
-    const explorer = new NewDiv(256, 128, 800, 600, '#fff', test);
-    explorer.createDiv();
-    explorer.appendToFrame(space);
-  </script>
-{% endblock %}
\ No newline at end of file
diff --git a/source/templates/hippie/app.liquid b/source/templates/hippie/app.liquid
new file mode 100644
index 0000000..58ca863
--- /dev/null
+++ b/source/templates/hippie/app.liquid
@@ -0,0 +1,40 @@
+{% assign pageBase = "../../../" -%}
+{% assign pageId = page.fileSlug -%}
+{% assign pageClass = "html_ui" -%}
+{%- layout "hippie/default.liquid" %}
+
+{% block title %}{{ title }}{% endblock %}
+
+{% block links %}
+{{ block.super -}}
+<link href="/vendor/bootstrap-icons/font/bootstrap-icons.min.css" rel="stylesheet">
+<link href="{{ pageBase }}css/ui.css" media="all" rel="stylesheet"/>
+{% endblock %}
+
+{% block script %}
+{{ block.super -}}
+<script src="https://code.jquery.com/jquery-3.3.1.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
+<script src="{{ pageBase }}js/variables.js"></script>
+<script src="{{ pageBase }}js/app.js"></script>
+
+<script>
+	const frameHeader = document.querySelector('body > header.io');
+	const closeActionElements = document.querySelectorAll('[data-action=close]');
+
+	if (frameHeader) {
+		console.log('frame header found', frameHeader);
+
+		frameHeader.addEventListener('click', (e) => {
+			if (e.target.dataset.action === 'close') {
+				console.debug('close', e.target);
+
+				history.back();
+
+				if (closeActionElements.length > 1) {
+					console.debug('other frames present', closeActionElements.length);
+				}
+			}
+		});
+	}
+</script>
+{% endblock %}
\ No newline at end of file
diff --git a/source/templates/hippie/partials/frame-header.liquid b/source/templates/hippie/partials/frame-header.liquid
new file mode 100644
index 0000000..14d04bc
--- /dev/null
+++ b/source/templates/hippie/partials/frame-header.liquid
@@ -0,0 +1,20 @@
+<header class="io">
+	<nav>
+		<button title="menu">
+			<i class="bi bi-three-dots"></i>
+		</button>
+		<span>{{ title | default: 'title-bar' }}</span>
+	</nav>
+	<nav>
+		<div class="spacer a"></div>
+		<button title="minimize">
+			<i class="bi bi-dash"></i>
+		</button>
+		<button title="maximize">
+			<i class="bi bi-fullscreen"></i>
+		</button>
+		<button title="close" data-action="close">
+			<i class="bi bi-x-square"></i>
+		</button>
+	</nav>
+</header>
\ No newline at end of file
diff --git a/source/templates/hippie/partials/frame-mode.liquid b/source/templates/hippie/partials/frame-mode.liquid
new file mode 100644
index 0000000..4e87985
--- /dev/null
+++ b/source/templates/hippie/partials/frame-mode.liquid
@@ -0,0 +1,10 @@
+<footer class="io">
+	<nav>
+		<button>mode</button>
+		<span>{{ title | default: 'mode-bar' }}</span>
+	</nav>
+	<nav>
+		<div class="spacer a"></div>
+		<button>action</button>
+	</nav>
+</footer>
\ No newline at end of file
diff --git a/source/templates/hippie/partials/frame-status.liquid b/source/templates/hippie/partials/frame-status.liquid
new file mode 100644
index 0000000..98c94f9
--- /dev/null
+++ b/source/templates/hippie/partials/frame-status.liquid
@@ -0,0 +1,11 @@
+<footer class="io">
+	<nav>
+		<span>## items</span>
+		<span># selected (size)</span>
+		<span># type(s)</span>
+		<span># shared</span>
+	</nav>
+	<nav>
+		<span>{{ title | default: 'status-bar' }}</span>
+	</nav>
+</footer>
\ No newline at end of file