diff --git a/package.json b/package.json index 1631d47d..6aafb741 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "osit-aether-app-svelte", - "version": "3.8.0", + "version": "3.9.0", "description": "One Sky IT's Aether App created with Svelte, SvelteKit, Tailwind CSS, Lucide, Font Awesome, and Skeleton UI. -Scott Idem", "homepage": "https://oneskyit.com/", "private": true, diff --git a/src/lib/ae_events_stores.ts b/src/lib/ae_events_stores.ts index d967bf4b..763d95b0 100644 --- a/src/lib/ae_events_stores.ts +++ b/src/lib/ae_events_stores.ts @@ -5,8 +5,8 @@ import type { Writable } from 'svelte/store'; import type { key_val } from '$lib/ae_stores'; // Set the version for the app data. Changing this should force a notification and ask the user to clear and reload the page. -let ver = '2025-10-15_1401'; -let ver_idb = '2025-10-15_1401'; +let ver = '2025-10-15_1423'; +let ver_idb = '2025-10-15_1423'; /* *** BEGIN *** Initialize events_local_data_struct */ // Longer-term app data. This should be stored to *local* storage. @@ -158,12 +158,11 @@ let events_local_data_struct: key_val = { 'host_file_config_path': 'device_configs/ae_native_app_config.default.json', }, - idle_timer: 5*60*1000, // How many seconds until idle - idle_cycle: 2*1000, // How frequently the idle status is checked - idle_loop_period: 1*60*1000, // How frequently the loop runs for the screen saver and similar + idle_timer: 7*60*1000, // How many seconds until idle + idle_cycle: 5*1000, // How frequently the idle status is checked + idle_loop_period: 3*60*1000, // How frequently the loop runs for the screen saver and similar - screen_saver_img_kv: {}, - // screen_saver_img_li: [], + screen_saver_img_kv: {}, // This key value list is generate when the launcher_file_cont is loaded. It only adds image file types. modal__title: '-- Not Set --', modal__open: null, modal__open_filename: null, diff --git a/src/lib/ae_utils/ae_utils__datetime_format.ts b/src/lib/ae_utils/ae_utils__datetime_format.ts index 0f85e333..c973d48f 100644 --- a/src/lib/ae_utils/ae_utils__datetime_format.ts +++ b/src/lib/ae_utils/ae_utils__datetime_format.ts @@ -141,7 +141,7 @@ export let iso_datetime_formatter = function iso_datetime_formatter( datetime_string = dayjs(raw_datetime).format('hh:mm:ss A Z'); break; case 'time_long': - datetime_string = dayjs(raw_datetime).format('HH:mm:ss A'); + datetime_string = dayjs(raw_datetime).format('HH:mm:ss'); break; case 'time_12_long': datetime_string = dayjs(raw_datetime).format('hh:mm:ss A'); diff --git a/src/lib/e_app_sys_menu.svelte b/src/lib/e_app_sys_menu.svelte index 5c17909b..1c687f42 100644 --- a/src/lib/e_app_sys_menu.svelte +++ b/src/lib/e_app_sys_menu.svelte @@ -1,6 +1,6 @@ @@ -943,6 +983,8 @@ $effect(() => { + + diff --git a/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte b/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte index 3e5a9d1c..6167c2cd 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher/[event_location_id]/+page.svelte @@ -37,7 +37,7 @@ import { kill_processes, open_local_file_v2, run_cmd, run_cmd_sync, run_osascrip // Variables // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other. -$slct.account_id = data.account_id; +// $slct.account_id = data.account_id; // console.log(`$slct.account_id = `, $slct.account_id); let ae_acct = data[$slct.account_id]; // console.log(`ae_acct = `, ae_acct); diff --git a/src/routes/events/[event_id]/(launcher)/launcher_cfg.svelte b/src/routes/events/[event_id]/(launcher)/launcher_cfg.svelte index ee896efa..ab6fdd32 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher_cfg.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher_cfg.svelte @@ -13,12 +13,12 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro
-
+

@@ -27,7 +27,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro

-
+ -
-

+

+ +

+ +
+
+ +
+
+ { + $events_sess.launcher.controller_unlock_group_code = !$events_sess.launcher.controller_unlock_group_code; + + $events_loc.launcher.ws_connect = false; + }} + readonly={!$events_sess.launcher.controller_unlock_group_code} + > + - - -
-
- -
-
- { - $events_sess.launcher.controller_unlock_group_code = !$events_sess.launcher.controller_unlock_group_code; - - $events_loc.launcher.ws_connect = false; - }} - readonly={!$events_sess.launcher.controller_unlock_group_code} - > + {#if $events_loc.launcher.ws_connect} - - {#if $events_loc.launcher.ws_connect} - - {/if} -
- - - - + {/if}
+ +
-
+ -
+

- Screen Saver + +

+
+ + + + + + + + + + + +
+
-
+ @@ -156,7 +224,10 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro * native Electron caching and open method (download to cache, copy and then open) * URL: new browser window --> -
+

@@ -164,15 +235,17 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro onclick={() => { $events_loc.launcher.show_section__app_modes = !$events_loc.launcher.show_section__app_modes; }} - class="ae_btn btn_sm btn_seamless" + class="btn btn-sm w-full justify-between" > - App Modes: - {$events_loc.launcher.app_mode ?? '-- not set --'} + {#if $events_loc.launcher.show_section__app_modes} {:else} {/if} + App Modes + + {$events_loc.launcher.app_mode ?? '-- not set --'}

@@ -190,7 +263,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro // ae_event_launcher.set($events_loc.launcher); console.log($events_loc.launcher); }} - title="Switch to default mode" + title="Switch to default web browser mode" > Change to Default Mode @@ -203,7 +276,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro // ae_event_launcher.set($ae_event_launcher); console.log($events_loc.launcher); }} - title="Switch to native mode" + title="Switch to native app mode" > Change to App Mode @@ -419,18 +492,154 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro -
+

- Local Config Refresh +

+ +
+
+ + + The action happens when the option is selected + +
+ +
+ + + + + + +
+ +
-
+
@@ -440,7 +649,16 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig } fro class="btn btn-sm p-1 preset-tonal-error hover:preset-filled-error-500" > - + Debug + + +
diff --git a/src/routes/events/[event_id]/+layout.svelte b/src/routes/events/[event_id]/+layout.svelte index 8f4b94a6..05f59331 100644 --- a/src/routes/events/[event_id]/+layout.svelte +++ b/src/routes/events/[event_id]/+layout.svelte @@ -30,7 +30,7 @@ import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_ev // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other. -$slct.account_id = data.account_id; +// $slct.account_id = data.account_id; let ae_acct = data[$slct.account_id]; if (log_lvl) { console.log(`ae_acct = `, ae_acct); diff --git a/src/routes/events/[event_id]/+page.svelte b/src/routes/events/[event_id]/+page.svelte index 317e06fa..95d73a15 100644 --- a/src/routes/events/[event_id]/+page.svelte +++ b/src/routes/events/[event_id]/+page.svelte @@ -503,9 +503,10 @@ max-w-max --> onchange={() => { $events_trigger = 'load__event_session_obj_li'; }} + title="Select to filter based on the location/room name" > {#if $lq__event_location_obj_li} - + {#each $lq__event_location_obj_li as event_location_obj} {/each} diff --git a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte index b7de1e52..1b622675 100644 --- a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte +++ b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte @@ -39,7 +39,7 @@ if (browser) { } // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other. -$slct.account_id = data.account_id; +// $slct.account_id = data.account_id; // console.log(`$slct.account_id = `, $slct.account_id); let ae_acct = data[$slct.account_id]; // console.log(`ae_acct = `, ae_acct); diff --git a/src/routes/events/[event_id]/locations/+page.svelte b/src/routes/events/[event_id]/locations/+page.svelte index 302c5d8b..333fed35 100644 --- a/src/routes/events/[event_id]/locations/+page.svelte +++ b/src/routes/events/[event_id]/locations/+page.svelte @@ -39,7 +39,7 @@ if (browser) { } // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other. -$slct.account_id = data.account_id; +// $slct.account_id = data.account_id; // console.log(`$slct.account_id = `, $slct.account_id); let ae_acct = data[$slct.account_id]; // console.log(`ae_acct = `, ae_acct); diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte index 944f02c1..9cf13b37 100644 --- a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte +++ b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte @@ -34,7 +34,7 @@ import MyClipboard from '$lib/e_app_clipboard.svelte'; // Variables // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other. -$slct.account_id = data.account_id; +// $slct.account_id = data.account_id; let ae_acct = data[$slct.account_id]; if (log_lvl) { console.log(`ae_acct = `, ae_acct); diff --git a/src/routes/events/[event_id]/reports/+page.svelte b/src/routes/events/[event_id]/reports/+page.svelte index 0d81a250..a133df0c 100644 --- a/src/routes/events/[event_id]/reports/+page.svelte +++ b/src/routes/events/[event_id]/reports/+page.svelte @@ -28,7 +28,7 @@ import Reports_files from './reports_files.svelte'; // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other. -$slct.account_id = data.account_id; +// $slct.account_id = data.account_id; console.log(`$slct.account_id = `, $slct.account_id); let ae_acct = data[$slct.account_id]; console.log(`ae_acct = `, ae_acct); diff --git a/src/routes/events/[event_id]/session/[session_id]/+page.svelte b/src/routes/events/[event_id]/session/[session_id]/+page.svelte index a855f000..6ec0259d 100644 --- a/src/routes/events/[event_id]/session/[session_id]/+page.svelte +++ b/src/routes/events/[event_id]/session/[session_id]/+page.svelte @@ -44,7 +44,7 @@ if (browser) { } // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other. -$slct.account_id = data.account_id; +// $slct.account_id = data.account_id; // console.log(`$slct.account_id = `, $slct.account_id); let ae_acct = data[$slct.account_id]; // console.log(`ae_acct = `, ae_acct); @@ -238,7 +238,7 @@ if (!$ae_loc.authenticated_access && $events_loc.pres_mgmt.show_content__session - +

{@html $lq__event_session_obj?.name ?? ae_snip.html__not_set} @@ -247,7 +247,7 @@ if (!$ae_loc.authenticated_access && $events_loc.pres_mgmt.show_content__session {#if !$events_loc.pres_mgmt?.hide__session_code && $lq__event_session_obj.code || $ae_loc.edit_mode}