From cc158f15b8c7965d176ecb9a4a0d3ce2d8fe6457 Mon Sep 17 00:00:00 2001 From: Joren de Graaf Date: Thu, 13 Aug 2026 16:59:18 +0200 Subject: [PATCH] latest changes --- assets/app.js | 10 +++++++++ assets/styles/app.scss | 31 +++++++++++++++++++++++++- src/Controller/BraindumpController.php | 8 +++---- templates/braindump/index.html.twig | 28 ++++++++++++++++++----- 4 files changed, 67 insertions(+), 10 deletions(-) diff --git a/assets/app.js b/assets/app.js index e957fe6..683fde0 100644 --- a/assets/app.js +++ b/assets/app.js @@ -2,7 +2,17 @@ import './styles/app.scss'; import htmx from 'htmx.org'; window.htmx = htmx; +document.body.addEventListener('htmx:beforeRequest', function () { + document.getElementById('request-failed').hidden = true; +}); +document.body.addEventListener('htmx:responseError', function () { + document.getElementById('request-failed').hidden = false; +}); + +document.body.addEventListener('htmx:sendError', function () { + document.getElementById('request-failed').hidden = false; +}); document.addEventListener('click', (event) => { const button = event.target.closest('[data-weather-location]'); if (!button) return; diff --git a/assets/styles/app.scss b/assets/styles/app.scss index 6737c57..2f5d00b 100644 --- a/assets/styles/app.scss +++ b/assets/styles/app.scss @@ -353,8 +353,37 @@ header { opacity: .65; text-decoration: line-through; } -.tasks-result { +.task-result { background-color: #fff; color: #000; padding: 25px; +} +.htmx-indicator { + display: none; +} + +.htmx-request.htmx-indicator { + display: inline-flex; + align-items: center; + gap: 0.35rem; +} + +.spinner { + animation: spin 1s linear infinite; +} + +@keyframes spin { + to { + transform: rotate(360deg); + } +} + + +.request-failed { + align-items: center; + gap: 0.35rem; +} + +.request-failed:not([hidden]) { + display: inline-flex; } \ No newline at end of file diff --git a/src/Controller/BraindumpController.php b/src/Controller/BraindumpController.php index b4976b3..3103f96 100644 --- a/src/Controller/BraindumpController.php +++ b/src/Controller/BraindumpController.php @@ -36,7 +36,7 @@ final class BraindumpController extends AbstractController // Get the user's brain dump. $brainDump = $request->getPayload()->getString('brain_dump'); - // dd('THIS IS THE NEW CONTROLLER', $brainDump); + // dd('THIS IS THE NEW CONTROLLER', $brainDump); // Tell Ollama exactly what structure we want back. $schema = [ 'type' => 'object', @@ -96,7 +96,7 @@ final class BraindumpController extends AbstractController 'json' => [ 'model' => 'qwen3:4b', - + 'think' => false, 'prompt' => <<toArray(); - // dd($data); + // dd($data); // dd($data['response']); file_put_contents( '/tmp/ollama-response.txt', @@ -141,7 +141,7 @@ PROMPT, ); //$json = $data['response'] ?? '{"tasks":[]}'; - $json = $data['thinking'] ?? '{"tasks":[]}'; + $json = $data['response'] ?? '{"tasks":[]}'; $tasks = json_decode($json, true); if (json_last_error() !== JSON_ERROR_NONE) { diff --git a/templates/braindump/index.html.twig b/templates/braindump/index.html.twig index d018ad5..3930469 100644 --- a/templates/braindump/index.html.twig +++ b/templates/braindump/index.html.twig @@ -12,7 +12,9 @@ hx-post="{{ path('app_braindump_dump') }}" hx-target="#tasks-result" hx-swap="innerHTML" - > + hx-indicator="#thinking" + hx-disabled-elt="this" + > - + - + + progress_activity + Thinking… +
{# HTMX will put the proposed tasks here #}