From 1694dfb5c547ce21475f0680fce9e2a19c90787d Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Thu, 7 Mar 2024 13:33:51 -0500 Subject: [PATCH] Getting ready to implement Dexie for Svelte --- src/routes/events_badges/+layout.svelte | 8 ++++++++ src/routes/events_badges/+page.svelte | 14 +++++++++++--- src/routes/events_speakers/+layout.ts | 4 +++- 3 files changed, 22 insertions(+), 4 deletions(-) diff --git a/src/routes/events_badges/+layout.svelte b/src/routes/events_badges/+layout.svelte index 5841c2df..10105899 100644 --- a/src/routes/events_badges/+layout.svelte +++ b/src/routes/events_badges/+layout.svelte @@ -22,6 +22,14 @@ let ae_promises: key_val = {}; if (data.url.searchParams.get('event_id')) { $events_slct.event_id = data.url.searchParams.get('event_id'); +} else if (data.ae_loc.site_cfg_json.slct__event_id) { + $events_slct.event_id = data.ae_loc.site_cfg_json.slct__event_id; +} else if ($events_loc.default__event_id) { + $events_slct.event_id = $events_loc.default__event_id; +} else if ($events_slct.event_id) { + console.log(`Event ID already set:`, $events_slct.event_id); +} else { + console.log(`No Event ID set.`); } if ($events_slct.event_id) { diff --git a/src/routes/events_badges/+page.svelte b/src/routes/events_badges/+page.svelte index d32d7dca..f960e375 100644 --- a/src/routes/events_badges/+page.svelte +++ b/src/routes/events_badges/+page.svelte @@ -13,9 +13,17 @@ import { ae_util } from '$lib/ae_utils'; import Element_data_store from '$lib/element_data_store.svelte'; -if (data.url.searchParams.get('event_id')) { - $events_slct.event_id = data.url.searchParams.get('event_id'); -} +// if (data.url.searchParams.get('event_id')) { +// $events_slct.event_id = data.url.searchParams.get('event_id'); +// } else if (data.ae_loc.site_cfg_json.slct__event_id) { +// $events_slct.event_id = data.ae_loc.site_cfg_json.slct__event_id; +// } else if ($events_loc.default__event_id) { +// $events_slct.event_id = $events_loc.default__event_id; +// } else if ($events_slct.event_id) { +// console.log(`Event ID already set:`, $events_slct.event_id); +// } else { +// console.log(`No Event ID set.`); +// } onMount(() => { diff --git a/src/routes/events_speakers/+layout.ts b/src/routes/events_speakers/+layout.ts index ff177812..41595b67 100644 --- a/src/routes/events_speakers/+layout.ts +++ b/src/routes/events_speakers/+layout.ts @@ -1,8 +1,10 @@ /** @type {import('./$types').LayoutLoad} */ +import { get } from 'svelte/store'; + import { api } from '$lib/api'; import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; -import { get } from 'svelte/store'; +import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores'; export async function load({ params, parent, url }) { // route