mobile menu added
This commit is contained in:
@@ -2,6 +2,7 @@ import "../styles/components/fireworks-navigation.css";
|
||||
import "../styles/pages/fireworks-home.css";
|
||||
import "../styles/pages/map.css";
|
||||
import "../styles/pages/dashboard.css";
|
||||
import "../styles/components/burst-listener.css";
|
||||
import "../styles/theme.css";
|
||||
import "../scripts/theme.js";
|
||||
import "../scripts/manual-report.js";
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import "../styles/pages/home.css";
|
||||
import "../styles/components/burst-listener.css";
|
||||
import "../styles/theme.css";
|
||||
import "../scripts/theme.js";
|
||||
import "../scripts/manual-report.js";
|
||||
|
||||
@@ -0,0 +1,83 @@
|
||||
class BurstListenerProcessor extends AudioWorkletProcessor {
|
||||
constructor() {
|
||||
super();
|
||||
this.samples = new Float32Array(Math.ceil(sampleRate * 10));
|
||||
this.position = 0;
|
||||
this.count = 0;
|
||||
this.interval = 0;
|
||||
this.energy = 0;
|
||||
this.peak = 0;
|
||||
this.baseline = 0.01;
|
||||
this.lastTrigger = -sampleRate * 10;
|
||||
this.postRoll = 0;
|
||||
this.eventPosition = 0;
|
||||
this.eventCount = 0;
|
||||
this.frame = 0;
|
||||
this.mode = "listening";
|
||||
this.port.onmessage = ({ data }) => {
|
||||
if (data === "snapshot") this.sendClip(this.count);
|
||||
if (data === "reset") this.reset();
|
||||
};
|
||||
}
|
||||
|
||||
reset() {
|
||||
this.samples.fill(0);
|
||||
this.position = 0;
|
||||
this.count = 0;
|
||||
this.interval = 0;
|
||||
this.energy = 0;
|
||||
this.peak = 0;
|
||||
this.baseline = 0.01;
|
||||
this.lastTrigger = this.frame;
|
||||
this.postRoll = 0;
|
||||
this.mode = "listening";
|
||||
}
|
||||
|
||||
sendClip(length) {
|
||||
const clip = new Float32Array(length);
|
||||
let start = (this.position - length + this.samples.length) % this.samples.length;
|
||||
for (let i = 0; i < length; i++) clip[i] = this.samples[(start + i) % this.samples.length];
|
||||
this.port.postMessage({ type: "clip", samples: clip, sampleRate }, [clip.buffer]);
|
||||
}
|
||||
|
||||
process(inputs) {
|
||||
const channel = inputs[0]?.[0];
|
||||
if (!channel || this.mode === "captured") return true;
|
||||
for (let i = 0; i < channel.length; i++) {
|
||||
const value = channel[i];
|
||||
this.samples[this.position] = value;
|
||||
this.position = (this.position + 1) % this.samples.length;
|
||||
this.count = Math.min(this.count + 1, this.samples.length);
|
||||
this.energy += value * value;
|
||||
this.peak = Math.max(this.peak, Math.abs(value));
|
||||
this.interval++;
|
||||
this.frame++;
|
||||
if (this.mode === "tail") {
|
||||
if (--this.postRoll === 0) {
|
||||
this.mode = "captured";
|
||||
this.sendClip(Math.min(this.count, Math.round(sampleRate * 10)));
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (this.interval >= Math.round(sampleRate / 30)) {
|
||||
const rms = Math.sqrt(this.energy / this.interval);
|
||||
this.port.postMessage({ type: "level", value: Math.max(rms, this.peak * 0.5) });
|
||||
if (this.mode === "listening" && this.frame > sampleRate && this.frame - this.lastTrigger > sampleRate * 3
|
||||
&& rms > Math.max(0.075, this.baseline * 5) && this.peak > 0.16) {
|
||||
this.mode = "tail";
|
||||
this.postRoll = Math.round(sampleRate * 2);
|
||||
this.lastTrigger = this.frame;
|
||||
this.port.postMessage({ type: "trigger" });
|
||||
} else if (this.mode === "listening") {
|
||||
this.baseline = this.baseline * 0.98 + Math.min(rms, this.baseline * 2) * 0.02;
|
||||
}
|
||||
this.interval = 0;
|
||||
this.energy = 0;
|
||||
this.peak = 0;
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
registerProcessor("burst-listener", BurstListenerProcessor);
|
||||
@@ -0,0 +1,157 @@
|
||||
const form = document.querySelector("#manual-report-form");
|
||||
|
||||
export function createBurstListener() {
|
||||
if (!form) return null;
|
||||
const start = document.querySelector("#burst-start");
|
||||
const panel = document.querySelector("#burst-panel");
|
||||
const heading = document.querySelector("#burst-heading");
|
||||
const detail = document.querySelector("#burst-detail");
|
||||
const canvas = document.querySelector("#burst-waveform");
|
||||
const preview = document.querySelector("#burst-preview");
|
||||
const resume = document.querySelector("#burst-resume");
|
||||
const discard = document.querySelector("#burst-discard");
|
||||
const stop = document.querySelector("#burst-stop");
|
||||
const error = document.querySelector("#burst-error");
|
||||
const levels = new Float32Array(300);
|
||||
let levelPosition = 0;
|
||||
let state = "off";
|
||||
let stream, context, source, node, silentOutput, previewUrl, captured, pendingSnapshot;
|
||||
|
||||
function draw() {
|
||||
const ctx = canvas.getContext("2d");
|
||||
ctx.clearRect(0, 0, canvas.width, canvas.height);
|
||||
ctx.fillStyle = "#ffbd62";
|
||||
const width = canvas.width / levels.length;
|
||||
const scale = Math.max(0.003, ...levels);
|
||||
for (let i = 0; i < levels.length; i++) {
|
||||
const value = levels[(levelPosition + i) % levels.length];
|
||||
const height = Math.max(2, Math.min(canvas.height, (value / scale) * canvas.height * 0.8));
|
||||
ctx.fillRect(i * width, (canvas.height - height) / 2, Math.max(1, width - 1), height);
|
||||
}
|
||||
}
|
||||
|
||||
function clearClip() {
|
||||
captured = null;
|
||||
preview.pause();
|
||||
preview.removeAttribute("src");
|
||||
preview.load();
|
||||
preview.hidden = true;
|
||||
if (previewUrl) URL.revokeObjectURL(previewUrl);
|
||||
previewUrl = null;
|
||||
}
|
||||
|
||||
function setState(next) {
|
||||
state = next;
|
||||
start.hidden = next !== "off";
|
||||
panel.hidden = next === "off";
|
||||
resume.hidden = discard.hidden = next !== "captured";
|
||||
heading.textContent = next === "captured" ? "Sound captured" : next === "tail" ? "Sound detected — finishing clip…" : "Listening for the next sound…";
|
||||
detail.textContent = next === "listening" ? "Keeping the most recent ~10 seconds" : next === "captured" ? "Preview the clip or send your report." : "";
|
||||
}
|
||||
|
||||
function wav(samples, rate) {
|
||||
const bytes = new ArrayBuffer(44 + samples.length * 2);
|
||||
const view = new DataView(bytes);
|
||||
const write = (offset, value) => { for (let i = 0; i < value.length; i++) view.setUint8(offset + i, value.charCodeAt(i)); };
|
||||
write(0, "RIFF"); view.setUint32(4, bytes.byteLength - 8, true);
|
||||
write(8, "WAVEfmt "); view.setUint32(16, 16, true);
|
||||
view.setUint16(20, 1, true); view.setUint16(22, 1, true);
|
||||
view.setUint32(24, rate, true); view.setUint32(28, rate * 2, true);
|
||||
view.setUint16(32, 2, true); view.setUint16(34, 16, true);
|
||||
write(36, "data"); view.setUint32(40, samples.length * 2, true);
|
||||
for (let i = 0; i < samples.length; i++) {
|
||||
const sample = Math.max(-1, Math.min(1, samples[i]));
|
||||
view.setInt16(44 + i * 2, sample < 0 ? sample * 32768 : sample * 32767, true);
|
||||
}
|
||||
return new Blob([bytes], { type: "audio/wav" });
|
||||
}
|
||||
|
||||
function filename() {
|
||||
return `sound-signal-manual-${new Date().toISOString().replace(/[-:]/g, "").slice(0, 15)}.wav`;
|
||||
}
|
||||
|
||||
async function begin() {
|
||||
error.hidden = true;
|
||||
start.disabled = true;
|
||||
try {
|
||||
if (!navigator.mediaDevices?.getUserMedia || !window.AudioWorkletNode) throw new Error("Microphone listening is unavailable in this browser or connection.");
|
||||
stream = await navigator.mediaDevices.getUserMedia({ audio: { channelCount: 1 }, video: false });
|
||||
context = new AudioContext();
|
||||
await context.audioWorklet.addModule(new URL("./burst-listener-worklet.js", import.meta.url));
|
||||
source = context.createMediaStreamSource(stream);
|
||||
node = new AudioWorkletNode(context, "burst-listener");
|
||||
silentOutput = context.createGain();
|
||||
silentOutput.gain.value = 0;
|
||||
node.port.onmessage = ({ data }) => {
|
||||
if (data.type === "level" && (state === "listening" || state === "tail")) {
|
||||
levels[levelPosition] = data.value;
|
||||
levelPosition = (levelPosition + 1) % levels.length;
|
||||
draw();
|
||||
} else if (data.type === "trigger" && state === "listening") {
|
||||
setState("tail");
|
||||
} else if (data.type === "clip") {
|
||||
const file = new File([wav(data.samples, data.sampleRate)], filename(), { type: "audio/wav" });
|
||||
if (pendingSnapshot) {
|
||||
pendingSnapshot(file);
|
||||
pendingSnapshot = null;
|
||||
} else if (state === "tail") {
|
||||
clearClip();
|
||||
captured = file;
|
||||
previewUrl = URL.createObjectURL(file);
|
||||
preview.src = previewUrl;
|
||||
preview.hidden = false;
|
||||
setState("captured");
|
||||
}
|
||||
}
|
||||
};
|
||||
source.connect(node);
|
||||
node.connect(silentOutput).connect(context.destination);
|
||||
await context.resume();
|
||||
levels.fill(0); levelPosition = 0; draw();
|
||||
setState("listening");
|
||||
} catch (cause) {
|
||||
await end();
|
||||
error.textContent = cause.name === "NotAllowedError" ? "Microphone permission was denied. Manual reporting is still available." : (cause.message || "Microphone capture failed.");
|
||||
error.hidden = false;
|
||||
} finally {
|
||||
start.disabled = false;
|
||||
}
|
||||
}
|
||||
|
||||
async function end() {
|
||||
if (pendingSnapshot) { pendingSnapshot(null); pendingSnapshot = null; }
|
||||
clearClip();
|
||||
node?.disconnect(); source?.disconnect(); silentOutput?.disconnect();
|
||||
stream?.getTracks().forEach((track) => track.stop());
|
||||
await context?.close();
|
||||
stream = context = source = node = silentOutput = null;
|
||||
levels.fill(0); levelPosition = 0;
|
||||
setState("off");
|
||||
}
|
||||
|
||||
function reset() {
|
||||
clearClip();
|
||||
levels.fill(0); levelPosition = 0; draw();
|
||||
node?.port.postMessage("reset");
|
||||
if (node) setState("listening");
|
||||
}
|
||||
|
||||
start.addEventListener("click", begin);
|
||||
stop.addEventListener("click", end);
|
||||
discard.addEventListener("click", reset);
|
||||
resume.addEventListener("click", reset);
|
||||
window.addEventListener("pagehide", end);
|
||||
document.addEventListener("visibilitychange", () => { if (document.hidden) end(); });
|
||||
return {
|
||||
get active() { return state !== "off"; },
|
||||
async clipForSubmission() {
|
||||
if (captured) return captured;
|
||||
if (state === "off" || !node) return null;
|
||||
return new Promise((resolve) => {
|
||||
pendingSnapshot = resolve;
|
||||
node.port.postMessage("snapshot");
|
||||
});
|
||||
},
|
||||
submissionSucceeded: reset,
|
||||
};
|
||||
}
|
||||
@@ -1,3 +1,4 @@
|
||||
import { createBurstListener } from "./burst-listener.js";
|
||||
const t = window.BOOMCAST_I18N || {};
|
||||
|
||||
const manualForm = document.querySelector("#manual-report-form");
|
||||
@@ -15,6 +16,7 @@
|
||||
if (isMobileDevice) directionPanel.hidden = false;
|
||||
let orientationListener;
|
||||
let compassUnavailableTimeout;
|
||||
const burstListener = createBurstListener();
|
||||
|
||||
const isUsableNumber = (value) => Number.isFinite(value);
|
||||
const cardinalDirection = (heading) => ["N", "NE", "E", "SE", "S", "SW", "W", "NW"][Math.floor(((heading + 22.5) % 360) / 45)];
|
||||
@@ -90,9 +92,25 @@
|
||||
listenForCompassReading();
|
||||
};
|
||||
|
||||
const submitManualReport = () => {
|
||||
const submitManualReport = async () => {
|
||||
stopCompassReading();
|
||||
manualSubmit.disabled = true;
|
||||
if (burstListener?.active) {
|
||||
try {
|
||||
const audio = await burstListener.clipForSubmission();
|
||||
const data = new FormData(manualForm);
|
||||
if (audio) data.append("audio", audio);
|
||||
const response = await fetch(manualForm.action, { method: "POST", body: data, credentials: "same-origin" });
|
||||
const html = await response.text();
|
||||
document.querySelector("#manual-submission").outerHTML = html;
|
||||
if (response.ok) burstListener.submissionSucceeded();
|
||||
} catch (error) {
|
||||
document.querySelector("#manual-submission").textContent = "Could not send the report. Please try again.";
|
||||
} finally {
|
||||
manualSubmit.disabled = false;
|
||||
}
|
||||
return;
|
||||
}
|
||||
if (window.htmx) {
|
||||
htmx.ajax("POST", manualForm.action, {
|
||||
source: manualForm,
|
||||
@@ -124,4 +142,4 @@
|
||||
document.body.addEventListener("htmx:afterRequest", (event) => {
|
||||
if (event.detail.elt === manualForm) manualSubmit.disabled = false;
|
||||
});
|
||||
|
||||
|
||||
|
||||
@@ -35,9 +35,31 @@ function installThemeToggle() {
|
||||
});
|
||||
}
|
||||
|
||||
function installMobileMenu() {
|
||||
const button = document.querySelector(".fireworks-menu-toggle");
|
||||
if (!button) return;
|
||||
const close = () => {
|
||||
button.setAttribute("aria-expanded", "false");
|
||||
button.setAttribute("aria-label", button.dataset.openLabel);
|
||||
};
|
||||
button.addEventListener("click", () => {
|
||||
const expanded = button.getAttribute("aria-expanded") !== "true";
|
||||
button.setAttribute("aria-expanded", String(expanded));
|
||||
button.setAttribute("aria-label", expanded ? button.dataset.closeLabel : button.dataset.openLabel);
|
||||
});
|
||||
document.addEventListener("keydown", (event) => {
|
||||
if (event.key === "Escape" && button.getAttribute("aria-expanded") === "true") {
|
||||
close();
|
||||
button.focus();
|
||||
}
|
||||
});
|
||||
window.matchMedia("(min-width: 44.001rem)").addEventListener("change", close);
|
||||
}
|
||||
|
||||
applyTheme(savedTheme());
|
||||
if (document.readyState === "loading") {
|
||||
document.addEventListener("DOMContentLoaded", installThemeToggle, { once: true });
|
||||
document.addEventListener("DOMContentLoaded", () => { installThemeToggle(); installMobileMenu(); }, { once: true });
|
||||
} else {
|
||||
installThemeToggle();
|
||||
installMobileMenu();
|
||||
}
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
.burst-listener { width:min(100%,36rem); margin-top:1rem; }
|
||||
.burst-listener__button,.burst-listener__actions button { min-height:2.75rem; padding:.65rem 1rem; border:1px solid #ffd18c; border-radius:.7rem; color:#fff2df; font:inherit; font-weight:750; background:#39243a; cursor:pointer; }
|
||||
.burst-listener__panel { margin-top:.8rem; padding:1rem; border:1px solid #aa7294; border-radius:.8rem; background:#1b1730; color:#fff2df; }
|
||||
.burst-listener__panel canvas { display:block; width:100%; height:90px; margin:.8rem 0; background:#171225; border-radius:.4rem; }
|
||||
.burst-listener__panel p { margin:.5rem 0 1rem; color:#efc9dc; }
|
||||
.burst-listener__panel audio { width:100%; margin-bottom:1rem; }
|
||||
.burst-listener__actions { display:flex; flex-wrap:wrap; gap:.5rem; }
|
||||
.burst-listener [hidden] { display:none !important; }
|
||||
.burst-listener [role="alert"] { color:#ffd18c; }
|
||||
@@ -27,6 +27,7 @@
|
||||
box-shadow: 0 .5rem 1.5rem #fb718550;
|
||||
}
|
||||
.fireworks-header__controls { display: flex; align-items: center; gap: .65rem; }
|
||||
.fireworks-menu-toggle { display: none; }
|
||||
.fireworks-nav {
|
||||
display: flex;
|
||||
gap: .3rem;
|
||||
@@ -66,12 +67,28 @@
|
||||
box-shadow: inset 0 0 0 1px #9cc0ed;
|
||||
}
|
||||
@media (max-width: 44rem) {
|
||||
.fireworks-header { align-items: flex-start; flex-direction: column; margin-bottom: 2.5rem; }
|
||||
.fireworks-header__controls { width: 100%; justify-content: space-between; }
|
||||
}
|
||||
@media (max-width: 30rem) {
|
||||
.fireworks-header__controls { align-items: stretch; flex-direction: column; }
|
||||
.fireworks-nav { justify-content: space-between; }
|
||||
.fireworks-nav a { flex: 1; padding: .5rem; text-align: center; }
|
||||
.fireworks-header { flex-wrap: wrap; justify-content: flex-start; margin-bottom: 2.5rem; }
|
||||
.fireworks-menu-toggle {
|
||||
display: flex;
|
||||
flex: 0 0 auto;
|
||||
flex-direction: column;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
gap: .3rem;
|
||||
width: 2.75rem;
|
||||
height: 2.75rem;
|
||||
padding: 0;
|
||||
border: 1px solid var(--theme-line);
|
||||
border-radius: .7rem;
|
||||
color: var(--theme-ink);
|
||||
background: var(--theme-surface-raised);
|
||||
cursor: pointer;
|
||||
}
|
||||
.fireworks-menu-toggle span { width: 1.2rem; height: 2px; border-radius: 2px; background: currentColor; }
|
||||
.fireworks-menu-toggle:focus-visible { outline: 3px solid #8abaff; outline-offset: 3px; }
|
||||
.fireworks-header__controls { display: none; flex-basis: 100%; width: 100%; flex-direction: column; align-items: stretch; }
|
||||
.fireworks-menu-toggle[aria-expanded="true"] ~ .fireworks-header__controls { display: flex; }
|
||||
.fireworks-nav { flex-direction: column; }
|
||||
.fireworks-nav a { padding: .75rem; }
|
||||
.theme-toggle--inline { width: 100%; }
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user