From 1d840052c7af24e75de9215a5ee91ab18b8b0b5a Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Mon, 21 Jul 2025 20:36:44 -0400 Subject: [PATCH] More work on the new Launcher. Wrapping up for the day. --- src/lib/ae_stores.ts | 14 +- src/routes/+layout.svelte | 2 +- src/routes/events/+layout.svelte | 13 +- .../(launcher)/launcher/+layout.svelte | 41 +++- .../(launcher)/launcher_menu.svelte | 175 ++++++++++++------ .../(launcher)/menu_session_list.svelte | 19 +- src/routes/events/[event_id]/+layout.svelte | 6 +- 7 files changed, 189 insertions(+), 81 deletions(-) diff --git a/src/lib/ae_stores.ts b/src/lib/ae_stores.ts index 13baf50b..6693f40b 100644 --- a/src/lib/ae_stores.ts +++ b/src/lib/ae_stores.ts @@ -60,12 +60,20 @@ const ae_app_local_data_defaults: key_val = { cache_expired: false, ver: ver, // ver, // '2025-04-18_1100', ver_idb: ver_idb, // '2025-04-18_1100', + name: 'Aether - App Hub (SvelteKit 2.x Svelte 4.x)', + theme: 'light', theme_mode: 'light', theme_name: 'nouveau', // wintry iframe: false, + + // disable_sys_header: false, + // disable_sys_nav: false, + // disable_sys_footer: false, + browser_type: null, // Safari needs help with scrolling correctly in iframes. + title: `OSIT's Æ`, // - Dev SvelteKit`, // Æ // debug_menu: false, // Flag show debug menu. @@ -332,9 +340,9 @@ let ae_app_session_data_defaults: key_val = { ver_idb: ver_idb, log_lvl: 0, - // 'name': 'Aether App Template', - // 'theme': 'light', - // 'account_id': ae_account_id, + disable_sys_header: false, + disable_sys_nav: false, + disable_sys_footer: false, sys_menu: { }, diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 2fb6160b..7d55a0e8 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -1080,7 +1080,7 @@ email = ${$ae_loc?.email} window.location.reload(); }} - class="btn btn-sm m-1 preset-tonal-secondary border border-secondary-500 hover:preset-tonal-warning border border-warning-500 hover:variant-outline-warning text-error-700 hover:text-error-900 transition-all text-wrap" + class="btn btn-sm m-1 preset-tonal-secondary border-secondary-500 hover:preset-tonal-warning border-warning-500 hover:variant-outline-warning text-error-700 hover:text-error-900 transition-all text-wrap" title="Reload and clear the page cache" > diff --git a/src/routes/events/+layout.svelte b/src/routes/events/+layout.svelte index 3b84aa3a..e57081c0 100644 --- a/src/routes/events/+layout.svelte +++ b/src/routes/events/+layout.svelte @@ -151,7 +151,7 @@ if (browser) { " > - +{#if !$ae_sess?.disable_sys_nav} +{/if}
+{#if !$ae_sess?.disable_sys_footer}
+{/if} diff --git a/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte b/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte index 58ed6730..55712728 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher/+layout.svelte @@ -41,6 +41,10 @@ $slct.account_id = data.account_id; let ae_acct = data[$slct.account_id]; // console.log(`ae_acct = `, ae_acct); +$ae_sess.disable_sys_nav = true; +$ae_sess.disable_sys_header = true; +$ae_sess.disable_sys_footer = true; + // This is a just in case check... if (!$events_loc?.launcher) { $events_loc.launcher = { @@ -92,10 +96,20 @@ let lq__event_obj = $derived(liveQuery(async () => { return results; })); +// Event File - For Event +let lq__event_event_file_obj_li = $derived(liveQuery(async () => { + let results = await db_events.files + .where('for_id_random') + .equals($events_slct.event_id ?? '') + .sortBy('filename'); + + return results; +})); + // Event File - For Location let lq__location_event_file_obj_li = $derived(liveQuery(async () => { let results = await db_events.files - // .where('event_session_id_random') + // .where('event_location_id_random') .where('for_id_random') .equals($events_slct.event_location_id ?? '') .sortBy('filename'); @@ -576,11 +590,16 @@ $effect(() => { -
+
{#if !$lq__event_obj} -
+
Loading...
@@ -614,9 +633,10 @@ $effect(() => {
@@ -624,11 +644,14 @@ $effect(() => {
@@ -643,6 +666,7 @@ $effect(() => { lq__event_obj={lq__event_obj} + lq__event_event_file_obj_li={lq__event_event_file_obj_li} lq__location_event_file_obj_li={lq__location_event_file_obj_li} lq__event_location_obj={lq__event_location_obj} @@ -669,6 +693,7 @@ $effect(() => { container h-full flex flex-col gap-1 py-1 px-2 items-center basis-4/5 + min-w-xs max-w-full overflow-y-auto " diff --git a/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte b/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte index 458d25b5..40d1c159 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte @@ -2,6 +2,7 @@ interface Props { data_url: any; lq__event_obj: any; + lq__event_event_file_obj_li: any; lq__location_event_file_obj_li: any; // lq__event_location_obj: any; // export let lq__event_location_obj_li: any; @@ -15,6 +16,7 @@ interface Props { let { data_url, lq__event_obj, + lq__event_event_file_obj_li, lq__location_event_file_obj_li, // lq__event_location_obj, lq__event_location_obj_li, @@ -74,67 +76,69 @@ let ae_promises: key_val = $state({ -
- -

{$lq__event_obj?.cfg_json.short_name ?? 'loading...'}

- - - + + +{#if $lq__event_event_file_obj_li} +
+ + {#each $lq__event_event_file_obj_li as event_file_obj, index} + + {/each} +
+{/if} + + +{#if $ae_loc.edit_mode} {#if $lq__event_location_obj_li && $lq__event_location_obj_li.length > 0} -
+
Locations: {#if $ae_loc.administrator_access} - ({$lq__event_location_obj_li?.length}) + ({$lq__event_location_obj_li?.length}×) {/if} {#await ae_promises[slct_event_location_id]} {:then result} - + {/await}