From 7456271782d9ec9a182ca427412d2811eb93d6c4 Mon Sep 17 00:00:00 2001 From: Helmut Merz Date: Mon, 6 Mar 2023 16:10:35 +0100 Subject: [PATCH] experiments with display (+ link with id) and input (+ default expression) --- assets/js/common.ts | 15 ++++++++++++--- exampleSite/content/app/test1.md | 10 +++++----- layouts/shortcodes/pv/display.html | 4 +++- layouts/shortcodes/pv/input-textline.html | 3 ++- 4 files changed, 22 insertions(+), 10 deletions(-) diff --git a/assets/js/common.ts b/assets/js/common.ts index 46001bc..3cab99e 100644 --- a/assets/js/common.ts +++ b/assets/js/common.ts @@ -103,18 +103,27 @@ function getSid(): string { //localStorage.setItem('api.sessionid', '') async function dopoll(app: typeof appdata) { + const wait_time = 10000 while (true) { try { let res = await fetch(app.conf.pollurl) let msg = await res.json() console.log(msg) - if (msg.status === 'data') { - app.handle(msg) + switch (msg.status) { + case 'idle': + break + case 'data': + app.handle(msg) + break + default: + console.log('poll response: ', msg) + await sleep(wait_time) } } catch (error) { console.log(error) - await new Promise(r => setTimeout(r, 10000)) + await sleep(wait_time) } } } +const sleep = (delay: number) => new Promise(r => setTimeout(r, delay)) diff --git a/exampleSite/content/app/test1.md b/exampleSite/content/app/test1.md index 29316f7..dc859f8 100644 --- a/exampleSite/content/app/test1.md +++ b/exampleSite/content/app/test1.md @@ -16,15 +16,15 @@ cyberscopes example site - use petite-vue in Hugo-generated sites. {{< pv/fieldset >}} - {{< pv/input-textline name="firstname" attrs="autofocus" >}} - {{< pv/input-textline name="lastname" >}} + Id: {{< pv/input-textline name="id" defexpr="conf.itemid" >}} + First Name: {{< pv/input-textline name="firstname" attrs="autofocus" >}} + Last Name: {{< pv/input-textline name="lastname" >}} + Email: {{< pv/input-textline name="email" default="hm@cy55.de" >}} {{< pv/button >}} {{< pv/display expr="`${data.firstname} ${data.lastname}`.trim() || '???'" >}} - - {{< pv/display name="email" >}} + {{< pv/display name="id" linkto="data.id" >}} {{< /pv/fieldset >}} diff --git a/layouts/shortcodes/pv/display.html b/layouts/shortcodes/pv/display.html index dd79b96..64b926a 100644 --- a/layouts/shortcodes/pv/display.html +++ b/layouts/shortcodes/pv/display.html @@ -1,6 +1,8 @@ {{- $name := .Get "name" | default "textline" -}} {{- $expr := .Get "expr" | default (printf "data.%s" $name) -}} -{{- $default := .Get "default" | default "" -}} +{{- $linkto := .Get "linkto" -}}
+ {{- if $linkto }}{{ end -}}

+  {{- if $linkto }}
{{ end -}}
diff --git a/layouts/shortcodes/pv/input-textline.html b/layouts/shortcodes/pv/input-textline.html index fc3a003..01398ce 100644 --- a/layouts/shortcodes/pv/input-textline.html +++ b/layouts/shortcodes/pv/input-textline.html @@ -1,10 +1,11 @@ {{- $type := .Get "type" | default "text" -}} {{- $name := .Get "name" | default "textline" -}} {{- $default := .Get "default" | default "" -}} +{{- $defexpr := .Get "defexpr" | default (printf "'%s'" $default) -}}