diff --git a/src/lib/ae_stores.ts b/src/lib/ae_stores.ts index 108e29ae..15960f7f 100644 --- a/src/lib/ae_stores.ts +++ b/src/lib/ae_stores.ts @@ -47,8 +47,8 @@ export let ae_snip = string_snippets; // }; // 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-05-01_1445'; // KEEP: 2025-04-18_1335 and 2025-04-29_1545 -let ver_idb = '2025-04-18_1100'; // Not currently used +let ver = '2025-05-01_1445'; // KEEP: 2025-05-01_1445 +let ver_idb = '2025-05-01_1445'; // Not currently used // *** BEGIN *** Longer-term app data. This should be stored to local storage. const ae_app_local_data_defaults: key_val = { diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index f252efd0..f740d212 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -2,7 +2,7 @@ /** @type {import('./$types').LayoutData} */ // /** @type {import('./$types').LayoutProps} */ -let log_lvl: number = 0; +let log_lvl: number = 2; // *** Import Svelte specific // import { tick } from 'svelte'; @@ -15,16 +15,16 @@ import { AppShell, AppBar, initializeStores } from '@skeletonlabs/skeleton'; // Initialize the stores for Drawer, Modal, and Toast so they work throughout the app. initializeStores(); // import { Modal } from '@skeletonlabs/skeleton'; -import type { - ModalComponent - } from '@skeletonlabs/skeleton'; +// import type { +// ModalComponent +// } from '@skeletonlabs/skeleton'; -const modalRegistry: Record = { - // Set a unique modal ID, then pass the component reference - // modalComponentEditSponsorshipObj: { ref: ModalComponentEditSponsorshipObj }, - // modalComponentTwo: { ref: ModalComponentTwo }, - // ... -}; +// const modalRegistry: Record = { +// // Set a unique modal ID, then pass the component reference +// // modalComponentEditSponsorshipObj: { ref: ModalComponentEditSponsorshipObj }, +// // modalComponentTwo: { ref: ModalComponentTwo }, +// // ... +// }; import { ArrowBigRight, // CircleX, @@ -152,7 +152,7 @@ if (!$ae_loc?.site_cfg_json) { // BEGIN: New Version Check: -if ($ae_loc && $ae_sess && ($ae_loc.ver != $ae_sess.ver)) { +if ($ae_loc && $ae_sess && ($ae_loc?.ver != $ae_sess?.ver)) { if (log_lvl) { console.log('ROOT: New version of the ae_loc (core local storage) available!!!'); console.log(`$ae_loc.ver: ${$ae_loc.ver} != $ae_sess.ver: ${$ae_sess.ver}`); @@ -309,6 +309,9 @@ if (!$ae_loc?.last_cache_refresh) { // Default is null, currently... if (log_lvl > 1) { console.log(`ROOT: Last IDB reload is recent: ${$ae_loc.last_cache_refresh}`); } + + flag_expired = false; + $ae_loc.cache_expired = false; } } // END: Expired Cache Check: @@ -316,7 +319,7 @@ if (!$ae_loc?.last_cache_refresh) { // Default is null, currently... // BEGIN: Access Checks: // Updated 2024-11-21 -if ($ae_loc.site_access_key || $ae_loc.site_domain_access_key) { +if ($ae_loc?.site_access_key || $ae_loc?.site_domain_access_key) { // log_lvl = 2; if (log_lvl > 1) { console.log(`We need to do a current check against the allow_access value. site key: ${$ae_loc.site_access_key}, domain key: ${$ae_loc.site_domain_access_key}`); @@ -366,28 +369,28 @@ if ($ae_loc.site_access_key || $ae_loc.site_domain_access_key) { // } // } -// This is mainly for Precon CHOW -if ($ae_loc?.site_cfg_json?.slct__sponsorship_cfg_id) { - $slct.sponsorship_cfg_id = $ae_loc.site_cfg_json.slct__sponsorship_cfg_id; - if ($ae_loc?.mod?.sponsorships) { - $ae_loc.mod.sponsorships.cfg_id = $ae_loc.site_cfg_json.slct__sponsorship_cfg_id; - } else { - $ae_loc.mod = { - ...$ae_loc.mod, - sponsorships: { - cfg_id: $ae_loc.site_cfg_json.slct__sponsorship_cfg_id - } - }; - } -} else if ($ae_loc?.sponsorship_cfg_id) { - $slct.sponsorship_cfg_id = $ae_loc.sponsorship_cfg_id; - $ae_loc.mod.sponsorships.cfg_id = $ae_loc.sponsorship_cfg_id; -} else { - if (log_lvl > 1) { - console.log(`No Sponsorship Config ID set.`); - } -} -// END: Special Checks +// // This is mainly for Precon CHOW +// if ($ae_loc?.site_cfg_json?.slct__sponsorship_cfg_id) { +// $slct.sponsorship_cfg_id = $ae_loc.site_cfg_json.slct__sponsorship_cfg_id; +// if ($ae_loc?.mod?.sponsorships) { +// $ae_loc.mod.sponsorships.cfg_id = $ae_loc.site_cfg_json.slct__sponsorship_cfg_id; +// } else { +// $ae_loc.mod = { +// ...$ae_loc.mod, +// sponsorships: { +// cfg_id: $ae_loc.site_cfg_json.slct__sponsorship_cfg_id +// } +// }; +// } +// } else if ($ae_loc?.sponsorship_cfg_id) { +// $slct.sponsorship_cfg_id = $ae_loc.sponsorship_cfg_id; +// $ae_loc.mod.sponsorships.cfg_id = $ae_loc.sponsorship_cfg_id; +// } else { +// if (log_lvl > 1) { +// console.log(`No Sponsorship Config ID set.`); +// } +// } +// // END: Special Checks // Root Svelte Layout Specific: let trigger_clear_access: null|boolean = $state(null); @@ -448,28 +451,11 @@ if (browser && flag_reload) { function clear_idb() { indexedDB.deleteDatabase('ae_archives_db'); // Archives module - // indexedDB.deleteDatabase('content'); // Archives module <-- WARNING indexedDB.deleteDatabase('ae_core_db'); indexedDB.deleteDatabase('ae_events_db'); // Events module - // indexedDB.deleteDatabase('badges'); // Events module <-- WARNING - // indexedDB.deleteDatabase('devices'); // Events module <-- WARNING - // indexedDB.deleteDatabase('exhibits'); // Events module <-- WARNING - // indexedDB.deleteDatabase('exhibit_tracking'); // Events module - // indexedDB.deleteDatabase('files'); // Events module <-- WARNING - // indexedDB.deleteDatabase('locations'); // Events module <-- WARNING - // indexedDB.deleteDatabase('presentations'); // Events module <-- WARNING - // indexedDB.deleteDatabase('presenters'); // Events module <-- WARNING - // indexedDB.deleteDatabase('sessions'); // Events module <-- WARNING - // indexedDB.deleteDatabase('file'); // Core - Hosted Files module indexedDB.deleteDatabase('ae_journals_db'); // Journals module - // indexedDB.deleteDatabase('journal_entry'); - // indexedDB.deleteDatabase('notes'); indexedDB.deleteDatabase('ae_posts_db'); // Posts module - // indexedDB.deleteDatabase('comment'); // Posts module <-- WARNING indexedDB.deleteDatabase('ae_sponsorships_db'); // Sponsorships module - // indexedDB.deleteDatabase('cfg'); // Sponsorships module <-- WARNING - // indexedDB.deleteDatabase('person'); // Core - People module - // indexedDB.deleteDatabase('user'); // Core - Not currently used } function clear_local() { @@ -477,6 +463,7 @@ function clear_local() { // localStorage.removeItem('ae_idaa_loc'); // localStorage.removeItem('ae_journals_loc'); // localStorage.removeItem('ae_events_loc'); + $ae_loc.allow_access = false; $ae_loc.authenticated_access = false; $ae_loc.edit_mode = false; @@ -862,6 +849,21 @@ $effect(() => { + + + {:else if (browser && $ae_loc?.allow_access)} @@ -920,10 +909,12 @@ $effect(() => { {@render children?.()} {:else if (browser || flag_reload)} - - - Loading... - +
+
+ + Page data is loading... +
+
{/if} {#if (browser) } @@ -936,6 +927,54 @@ $effect(() => { {:else} {/if} + +{:else} +
+
+ + Loading... +
+ + + + +
{/if} diff --git a/src/routes/+layout.ts b/src/routes/+layout.ts index 8f93136c..30087c3f 100644 --- a/src/routes/+layout.ts +++ b/src/routes/+layout.ts @@ -305,9 +305,7 @@ export async function load({ fetch, params, parent, route, url }) { // params, r } // console.log(`ae_acct = `, ae_acct); - // WARNING: Precaution against shared data between sites and sessions. - // data_struct.ae_acct[ae_loc_init.account_id] = ae_acct; - + // WARNING: Using the Account ID is a precaution against shared data between other accounts (sites and sessions). data_struct[ae_loc_init.account_id] = ae_acct; return data_struct; diff --git a/src/routes/+page.ts b/src/routes/+page.ts index befae461..66ede663 100644 --- a/src/routes/+page.ts +++ b/src/routes/+page.ts @@ -1,7 +1,7 @@ /** @type {import('./$types').PageLoad} */ export function load() { - return { - ae_root_page_ts: true, - }; + // return { + // ae_root_page_ts: true, + // }; } diff --git a/src/routes/idaa/(idaa)/+layout.svelte b/src/routes/idaa/(idaa)/+layout.svelte index 7f58f9b1..0391ccaa 100644 --- a/src/routes/idaa/(idaa)/+layout.svelte +++ b/src/routes/idaa/(idaa)/+layout.svelte @@ -1,8 +1,6 @@ - IDAA - {$idaa_loc.title ?? 'Æ loading...'} + IDAA - {$idaa_loc?.title ?? 'Æ loading...'} {#snippet header()} @@ -102,7 +102,7 @@ let { data, children }: Props = $props();