From 64e2ceb7c3eacf9dd5501b20cc4b815e520ec726 Mon Sep 17 00:00:00 2001 From: andz-bb Date: Fri, 7 Jul 2023 18:06:55 +0100 Subject: [PATCH 1/9] add scanner beep on successful qr/barcode scan --- packages/client/manifest.json | 40 +++++++++++++++++++ .../components/app/forms/CodeScanner.svelte | 30 ++++++++++++++ .../app/forms/CodeScannerField.svelte | 6 +++ 3 files changed, 76 insertions(+) diff --git a/packages/client/manifest.json b/packages/client/manifest.json index 212042d3c0..90fbca0fe2 100644 --- a/packages/client/manifest.json +++ b/packages/client/manifest.json @@ -3172,6 +3172,46 @@ "key": "allowManualEntry", "defaultValue": false }, + { + "type": "boolean", + "label": "Play sound on scan", + "key": "beepOnScan", + "defaultValue": false + }, + { + "type": "select", + "label": "Sound pitch", + "key": "beepFrequency", + "dependsOn": "beepOnScan", + "defaultValue": 2637, + "options": [ + { + "label": "Low", + "value": 2096 + }, + { + "label": "Regular", + "value": 2637 + }, + { + "label": "High", + "value": 3136 + }, + { "label": "Custom", "value": "custom" } + ] + }, + { + "type": "number", + "label": "Sound frequency (Hz)", + "key": "customFrequency", + "defaultValue": 1046, + "min": 20, + "max": 8000, + "dependsOn": { + "setting": "beepFrequency", + "value": "custom" + } + }, { "type": "validation/string", "label": "Validation", diff --git a/packages/client/src/components/app/forms/CodeScanner.svelte b/packages/client/src/components/app/forms/CodeScanner.svelte index 5dff3a96fa..9895413446 100644 --- a/packages/client/src/components/app/forms/CodeScanner.svelte +++ b/packages/client/src/components/app/forms/CodeScanner.svelte @@ -8,6 +8,10 @@ export let disabled = false export let allowManualEntry = false export let scanButtonText = "Scan code" + export let beepOnScan = false + export let beepFrequency = 2637 + export let customFrequency = 1046 + const dispatch = createEventDispatcher() let videoEle @@ -21,8 +25,13 @@ fps: 25, qrbox: { width: 250, height: 250 }, } + const audioCtx = new (window.AudioContext || window.webkitAudioContext)() + const onScanSuccess = decodedText => { if (value != decodedText) { + if (beepOnScan) { + beep() + } dispatch("change", decodedText) } } @@ -84,6 +93,27 @@ } camModal.hide() } + + const beep = () => { + const oscillator = audioCtx.createOscillator() + const gainNode = audioCtx.createGain() + + oscillator.connect(gainNode) + gainNode.connect(audioCtx.destination) + + const frequency = + beepFrequency === "custom" ? customFrequency : beepFrequency + oscillator.frequency.value = frequency + oscillator.type = "square" + + const duration = 420 + const endTime = audioCtx.currentTime + duration / 1000 + gainNode.gain.setValueAtTime(1, audioCtx.currentTime) + gainNode.gain.exponentialRampToValueAtTime(0.001, endTime) + + oscillator.start() + oscillator.stop(endTime) + }
diff --git a/packages/client/src/components/app/forms/CodeScannerField.svelte b/packages/client/src/components/app/forms/CodeScannerField.svelte index 7e020aa9c7..c408f78d7c 100644 --- a/packages/client/src/components/app/forms/CodeScannerField.svelte +++ b/packages/client/src/components/app/forms/CodeScannerField.svelte @@ -11,6 +11,9 @@ export let onChange export let allowManualEntry export let scanButtonText + export let beepOnScan + export let beepFrequency + export let customFrequency let fieldState let fieldApi @@ -42,6 +45,9 @@ disabled={fieldState.disabled} {allowManualEntry} scanButtonText={scanText} + {beepOnScan} + {beepFrequency} + {customFrequency} /> {/if} From 891bcc118a9ccd1cda80acc8b77436383c8f0fff Mon Sep 17 00:00:00 2001 From: Andrew Kingston Date: Mon, 10 Jul 2023 09:17:37 +0100 Subject: [PATCH 2/9] Add embed config to single image nginx config --- hosting/single/nginx/nginx-default-site.conf | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/hosting/single/nginx/nginx-default-site.conf b/hosting/single/nginx/nginx-default-site.conf index 3903c0647d..d2f8e229c6 100644 --- a/hosting/single/nginx/nginx-default-site.conf +++ b/hosting/single/nginx/nginx-default-site.conf @@ -22,6 +22,16 @@ server { proxy_pass http://127.0.0.1:4001; } + location /embed { + rewrite /embed/(.*) /app/$1 break; + proxy_pass http://127.0.0.1:4001; + proxy_redirect off; + proxy_set_header Host $host; + proxy_set_header x-budibase-embed "true"; + add_header x-budibase-embed "true"; + add_header Content-Security-Policy "frame-ancestors *"; + } + location = / { proxy_pass http://127.0.0.1:4001; } From 09b271b95030a71d1a7b0a36d9cd0600eae05cef Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 10 Jul 2023 09:06:40 +0000 Subject: [PATCH 3/9] Bump version to 2.8.3 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index d0984de444..e31d4b9059 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.8.2", + "version": "2.8.3", "npmClient": "yarn", "packages": [ "packages/*" From 3b73d8e8c04460fab0a9d58da5583e3ad7342809 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 10 Jul 2023 10:12:26 +0000 Subject: [PATCH 4/9] Bump version to 2.8.4 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index e31d4b9059..068d2581c2 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.8.3", + "version": "2.8.4", "npmClient": "yarn", "packages": [ "packages/*" From 836fdf492c59bfbcbf78084f2bfff9c46f091eb5 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 10 Jul 2023 14:40:00 +0100 Subject: [PATCH 5/9] Fix curl import --- .../_components/panels/Queries/RestImportButton.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportButton.svelte index 682284adca..9a8bcd97a1 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportButton.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportButton.svelte @@ -2,11 +2,12 @@ import { Button, Modal } from "@budibase/bbui" import ImportQueriesModal from "./RestImportQueriesModal.svelte" + export let datasourceId let importQueriesModal - +
From 407f1bbb0af20a8146e6a02dd4f2d08a6bfcf591 Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 10 Jul 2023 15:04:46 +0100 Subject: [PATCH 6/9] Lint --- .../_components/panels/Queries/RestImportButton.svelte | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportButton.svelte b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportButton.svelte index 9a8bcd97a1..7f179d18b4 100644 --- a/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportButton.svelte +++ b/packages/builder/src/pages/builder/app/[application]/data/datasource/[datasourceId]/_components/panels/Queries/RestImportButton.svelte @@ -7,7 +7,7 @@ - +
From a06125ae18f958927109379d04a6a37c841eaa70 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 10 Jul 2023 14:24:01 +0000 Subject: [PATCH 7/9] Bump version to 2.8.5 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 068d2581c2..13c61d054f 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.8.4", + "version": "2.8.5", "npmClient": "yarn", "packages": [ "packages/*" From c847bdec31b15bcf1f3708630ec5e1e7428518ca Mon Sep 17 00:00:00 2001 From: Rory Powell Date: Mon, 10 Jul 2023 16:42:15 +0100 Subject: [PATCH 8/9] Lint fix --- .../src/components/common/bindings/BindingPanel.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/builder/src/components/common/bindings/BindingPanel.svelte b/packages/builder/src/components/common/bindings/BindingPanel.svelte index 6e09985440..3726380af5 100644 --- a/packages/builder/src/components/common/bindings/BindingPanel.svelte +++ b/packages/builder/src/components/common/bindings/BindingPanel.svelte @@ -208,7 +208,9 @@
Current Handlebars syntax is invalid, please check the guide - here + here for more details.
{:else} From 19fab7fa970a90a0a964d52df9498d5f72c64577 Mon Sep 17 00:00:00 2001 From: Budibase Staging Release Bot <> Date: Mon, 10 Jul 2023 15:58:13 +0000 Subject: [PATCH 9/9] Bump version to 2.8.6-alpha.0 --- lerna.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lerna.json b/lerna.json index 13c61d054f..4d129626b6 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "2.8.5", + "version": "2.8.6-alpha.0", "npmClient": "yarn", "packages": [ "packages/*"