Skip to content

Commit

Permalink
working changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@thiccnfun
thiccnfun committed Mar 9, 2024
1 parent b1f45ee commit d7e23e3
Show file tree
Hide file tree
Showing 23 changed files with 12,484 additions and 10,240 deletions.
9 changes: 9 additions & 0 deletions interface/src/app.css
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
@tailwind base;
@tailwind components;
@tailwind utilities;

.blink {
animation: blink 0.33s linear infinite;
}
@keyframes blink {
50% {
opacity: 0;
}
}
13 changes: 13 additions & 0 deletions interface/src/routes/configuration/+page.svelte
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<script lang="ts">
import type { PageData } from '../$types';
import Configuration from './Configuration.svelte';
export let data: PageData;
</script>

<div
class="mx-0 my-1 flex flex-col space-y-4
sm:mx-8 sm:my-8"
>
<Configuration />
</div>
7 changes: 7 additions & 0 deletions interface/src/routes/configuration/+page.ts
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import type { PageLoad } from './$types';

export const load = (async ({ fetch }) => {
return {
title: 'Voltcalizer - Configuration'
};
}) satisfies PageLoad;
221 changes: 221 additions & 0 deletions interface/src/routes/configuration/Configuration.svelte
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
<script lang="ts">
import { onMount, onDestroy } from 'svelte';
import { tweened } from 'svelte/motion';
import { user } from '$lib/stores/user';
import { page } from '$app/stores';
import { notifications } from '$lib/components/toasts/notifications';
import SettingsCard from '$lib/components/SettingsCard.svelte';
import HeatRateMonitor from '~icons/tabler/heart-rate-monitor';
import { cubicOut } from 'svelte/easing';
// type AppSettings = {
// led_on: boolean;
// };
type AppSettings = {
idle_period_min_ms: number;
idle_period_max_ms: number;
action_period_min_ms: number;
action_period_max_ms: number;
decibel_threshold_min: number;
decibel_threshold_max: number;
mic_sensitivity: 26 | 27 | 28 | 29;
};
let appSettings: AppSettings = {
idle_period_min_ms: 5000,
idle_period_max_ms: 30000,
action_period_min_ms: 3000,
action_period_max_ms: 5000,
decibel_threshold_min: 80,
decibel_threshold_max: 95,
mic_sensitivity: 27,
};
// let ecdMax = Infinity;
// const ecdProgress = tweened(0, {
// duration: 400,
// easing: cubicOut
// });
// async function getAppSettings() {
// try {
// const response = await fetch('/rest/appSettings', {
// method: 'GET',
// headers: {
// Authorization: $page.data.features.security ? 'Bearer ' + $user.bearer_token : 'Basic',
// 'Content-Type': 'application/json'
// }
// });
// const light = await response.json();
// lightOn = light.led_on;
// } catch (error) {
// console.error('Error:', error);
// }
// return;
// }
const ws_token = $page.data.features.security ? '?access_token=' + $user.bearer_token : '';
const appSettingsSocket = new WebSocket('ws://' + $page.url.host + '/ws/appSettings' + ws_token);
// window.appSettingsSocket = appSettingsSocket;
appSettingsSocket.onopen = (event) => {
appSettingsSocket.send('Hello');
};
appSettingsSocket.addEventListener('close', (event) => {
const closeCode = event.code;
const closeReason = event.reason;
console.log('WebSocket closed with code:', closeCode);
console.log('Close reason:', closeReason);
notifications.error('Websocket disconnected', 5000);
});
appSettingsSocket.onmessage = (event) => {
const message = JSON.parse(event.data);
if (message.type != 'id') {
appSettings = message;
// if (micState.ecd > ecdMax || ecdMax === Infinity) {
// ecdMax = micState.ecd;
// ecdProgress.set(0);
// } else {
// ecdProgress.set(1 - micState.ecd / ecdMax);
// }
}
};
onDestroy(() => appSettingsSocket.close());
async function updateSettings (settings: AppSettings) {
appSettingsSocket.send(JSON.stringify({
...appSettings,
...settings
}));
}
let formField: any;
function handleSubmit() {
// let valid = true;
const fd = new FormData(formField)
const {
mic_sensitivity_26 = null,
mic_sensitivity_27 = null,
mic_sensitivity_28 = null,
mic_sensitivity_29 = null,
...formObject
} = Object.fromEntries(fd.entries());
const newSettings: AppSettings = {
idle_period_max_ms: Number(formObject.idle_period_max_ms) * 1000,
idle_period_min_ms: Number(formObject.idle_period_min_ms) * 1000,
action_period_max_ms: Number(formObject.action_period_max_ms) * 1000,
action_period_min_ms: Number(formObject.action_period_min_ms) * 1000,
decibel_threshold_max: Number(formObject.decibel_threshold_max),
decibel_threshold_min: Number(formObject.decibel_threshold_min),
mic_sensitivity: !!mic_sensitivity_26 ? 26 : !!mic_sensitivity_27 ? 27 : !!mic_sensitivity_28 ? 28 : 29,
};
updateSettings(newSettings);
console.log(newSettings);
// // Validate Server
// // RegEx for IPv4
// const regexExpIPv4 =
// /\b(?:(?:2(?:[0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9])\.){3}(?:(?:2([0-4][0-9]|5[0-5])|[0-1]?[0-9]?[0-9]))\b/;
// const regexExpURL =
// /[-a-zA-Z0-9@:%_\+.~#?&//=]{2,256}\.[a-z]{2,4}\b(\/[-a-zA-Z0-9@:%_\+.~#?&//=]*)?/i;
// if (!regexExpURL.test(ntpSettings.server) && !regexExpIPv4.test(ntpSettings.server)) {
// valid = false;
// formErrors.server = true;
// } else {
// formErrors.server = false;
// }
// ntpSettings.tz_format = TIME_ZONES[ntpSettings.tz_label];
// // Submit JSON to REST API
// if (valid) {
// postNTPSettings(ntpSettings);
// //alert('Form Valid');
// }
}
onMount(() => {
// getAppSettings();
});
</script>

<SettingsCard collapsible={false}>
<HeatRateMonitor slot="icon" class="lex-shrink-0 mr-2 h-6 w-6 self-end" />
<span slot="title">Configuration</span>
<div class="w-full overflow-x-auto">
<form
class="form-control w-full"
on:submit|preventDefault={handleSubmit}
novalidate
bind:this={formField}
>
<div class="form-control">
<label class="label">
<span class="label-text">Idle Duration (seconds)</span>
</label>
<label class="input-group">
<span>Min</span>
<input name="idle_period_min_ms" type="number" placeholder="5" class="input input-bordered" value={appSettings.idle_period_min_ms / 1000} />
<span>Max</span>
<input name="idle_period_max_ms" type="number" placeholder="30" class="input input-bordered" value={appSettings.idle_period_max_ms / 1000} />
</label>
</div>
<div class="form-control">
<label class="label">
<span class="label-text">Action Period (seconds)</span>
</label>
<label class="input-group">
<span>Min</span>
<input name="action_period_min_ms" type="number" placeholder="3" class="input input-bordered" value={appSettings.action_period_min_ms / 1000} />
<span>Max</span>
<input name="action_period_max_ms" type="number" placeholder="5" class="input input-bordered" value={appSettings.action_period_max_ms / 1000} />
</label>
</div>
<div class="form-control">
<label class="label">
<span class="label-text">Loudness Threshold (dB)</span>
</label>
<label class="input-group">
<span>Min</span>
<input name="decibel_threshold_min" type="number" placeholder="80" class="input input-bordered" value={appSettings.decibel_threshold_min} />
<span>Max</span>
<input name="decibel_threshold_max" type="number" placeholder="95" class="input input-bordered" value={appSettings.decibel_threshold_max} />
</label>
</div>
<div class="form-control">
<label class="label">
<span class="label-text">Microphone Sensitivity</span>
</label>
<div class="rating input-group">
<span>Less</span>
<input type="radio" name="mic_sensitivity_26" class="mask mask-hexagon" checked={appSettings.mic_sensitivity === 26} />
<input type="radio" name="mic_sensitivity_27" class="mask mask-hexagon" checked={appSettings.mic_sensitivity === 27} />
<input type="radio" name="mic_sensitivity_28" class="mask mask-hexagon" checked={appSettings.mic_sensitivity === 28} />
<input type="radio" name="mic_sensitivity_29" class="mask mask-hexagon" checked={appSettings.mic_sensitivity === 29} />
<span>More</span>
</div>
</div>
<div class="mt-6 place-self-end">
<button class="btn btn-primary" type="submit">Apply Settings</button>
</div>
</form>

</div>
</SettingsCard>
137 changes: 0 additions & 137 deletions interface/src/routes/demo/Demo.svelte
View file

This file was deleted.

Loading

0 comments on commit d7e23e3

Please sign in to comment.