diff --git a/src/lib/ae_core_functions.ts b/src/lib/ae_core_functions.ts index 6cc29cc8..098f956a 100644 --- a/src/lib/ae_core_functions.ts +++ b/src/lib/ae_core_functions.ts @@ -30,7 +30,7 @@ async function handle_load_ae_obj_id__site_domain({ api_cfg, fqdn, try_cache=fal use_alt_table: true, // NOTE: This will use the table_name_alt value instead of the table_name value in the API config. use_alt_base: true, // NOTE: This will use the base_name_alt value instead of the base_name value in the API config. params: params, - log_lvl: 2 + log_lvl: 1 }) .then(function (site_domain_obj_get_result) { if (site_domain_obj_get_result) { diff --git a/src/lib/ae_sponsorships_functions.ts b/src/lib/ae_sponsorships_functions.ts new file mode 100644 index 00000000..c42b02cb --- /dev/null +++ b/src/lib/ae_sponsorships_functions.ts @@ -0,0 +1,49 @@ +import type { key_val } from '$lib/ae_stores'; +import { api } from '$lib/api'; + +// import { liveQuery } from "dexie"; +// import { db_core } from "$lib/db_core"; + +// let example_li = liveQuery( +// () => db_core.sponsorships.toArray() +// ); + +let ae_promises: key_val = {}; // Promise; + +// Updated 2024-03-20 +async function handle_load_ae_obj_id__sponsorship_cfg({ api_cfg, sponsorship_cfg_id, try_cache=false }) { + console.log(`*** handle_load_ae_obj_id__sponsorship_cfg() *** sponsorship_cfg_id=${sponsorship_cfg_id}`); + + let params = {}; + + // ae_loc.hub.sponsorships.qry_status = 'loading'; + ae_promises.load__sponsorship_cfg_obj = await api.get_ae_obj_id_crud({ + api_cfg: api_cfg, + obj_type: 'sponsorship_cfg', + obj_id: sponsorship_cfg_id, + use_alt_table: false, // NOTE: This will use the table_name_alt value instead of the table_name value in the API config. + use_alt_base: false, // NOTE: This will use the base_name_alt value instead of the base_name value in the API config. + params: params, + log_lvl: 2 + }) + .then(function (sponsorship_cfg_obj_get_result) { + if (sponsorship_cfg_obj_get_result) { + return sponsorship_cfg_obj_get_result; + } else { + console.log('No results returned.'); + return null; + } + }) + .catch(function (error) { + console.log('No results returned or failed.', error); + }); + + return ae_promises.load__sponsorship_cfg_obj; +} + + + +let export_obj = { + handle_load_ae_obj_id__sponsorship_cfg: handle_load_ae_obj_id__sponsorship_cfg, +}; +export let spons_func = export_obj; diff --git a/src/lib/ae_stores.ts b/src/lib/ae_stores.ts index 2a123f87..290407f0 100644 --- a/src/lib/ae_stores.ts +++ b/src/lib/ae_stores.ts @@ -46,7 +46,11 @@ export let ae_app_local_data_struct: key_val = { 'account_id': ae_account_id, // OSIT Demo _XY7DXtc9MY 'site_domain': null, // https://example.com, https://dev.example.com, etc. - 'site_cfg_json': {}, + 'site_cfg_json': { + slct__event_id: null, + slct__event_badge_template_id: null, + slct__sponsorship_cfg_id: null, + }, 'page_access_code_li': {'administrator': '11500', 'trusted': '19111', 'authenticated': '00000'}, 'administrator_passcode': '11500', diff --git a/src/lib/element_data_store.svelte b/src/lib/element_data_store.svelte index 47106577..cf2cf7bd 100644 --- a/src/lib/element_data_store.svelte +++ b/src/lib/element_data_store.svelte @@ -15,7 +15,7 @@ export let ds_name: null|string = null; export let ds_type: string = 'text'; export let for_type: null|string = null; export let for_id: null|string = null; -console.log(`ae_e_data_store ${ds_code} for_type=${for_type} for_id=${for_id}`); +console.log(`ae_e_data_store ${ds_code} for_type=${for_type} for_id=${for_id} account_id=${$ae_loc.account_id}`); export let store: string = 'local'; export let display: string = 'block'; @@ -60,10 +60,11 @@ let ds_code_obj = md: null, text: null, updated_on: null, + chk_account_id: null, }; let ae_ds_loc: Writable = localStorageStore(`ae_ds__${ds_code}`, ds_code_obj); -// console.log(`ae_ Data Store ${ds_code} = `, $ae_ds_loc); +console.log(`ae_e_data_store cached: ${ds_code} = `, $ae_ds_loc); if (!$ae_ds_loc.id) { ds_loading_status = '-- loading --'; @@ -76,7 +77,7 @@ $ae_sess.ds.update_status = null; let trigger: null|string = null; // This is a quick check to make sure the data store is not stale. If it is, then we need to trigger a reload. -if ($ae_ds_loc.loaded_on) { +if ($ae_ds_loc.loaded_on && $ae_ds_loc.chk_account_id == $ae_loc.account_id) { let loaded_on = new Date($ae_ds_loc.loaded_on); let now = new Date(); let diff = now.getTime() - loaded_on.getTime(); @@ -89,14 +90,9 @@ if ($ae_ds_loc.loaded_on) { setTimeout(() => { trigger = 'load__ds__code'; }, random_ms); - // trigger = 'load__ds__code'; } - // let diff_hours = diff / (1000 * 60 * 60); - // if (diff_hours > 1) { - // trigger = 'load__ds__code'; - // } } else { - console.log('No loaded_on date found. Need to trigger reload.'); + console.log('No loaded_on date found and or the account_id check failed. Need to trigger reload.'); trigger = 'load__ds__code'; } @@ -108,17 +104,19 @@ if (!$ae_ds_loc.account_id === null || $ae_loc.account_id == $ae_loc.account_id) onMount(() => { console.log('Element: Data Store element_data_store.svelte'); - // if (ds_code && ds_type) { - // trigger = 'load__ds__code'; - // $slct_trigger = 'load__ds__code'; - // } + // Wait for random number of milliseconds to avoid all data stores being reloaded at the same time. + let random_ms = Math.floor(Math.random() * 500); + console.log(`Random number of milliseconds: ${random_ms}`); + setTimeout(() => { + trigger = 'load__ds__code'; + }, random_ms); }); // let ds_code_li = {}; //: key_val; // = ae_loc_tmp.ds; // console.log(`ae_ ds_code_li = `, ds_code_li); $: if (trigger == 'load__ds__code' && ds_code && ds_type) { - console.log(`ae_ load__ds__code: ${ds_code} ${ds_type} ${for_type} ${for_id} ${try_cache}`); + console.log(`ae_ load__ds__code: ${ds_code} ds_type=${ds_type} for_type=${for_type} for_id=${for_id} ${try_cache}`); trigger = null; @@ -152,7 +150,7 @@ async function load_data_store( api_cfg: $ae_api, data_store_code: code, data_type: type, - log_lvl: 1 + log_lvl: 0 }) .then( function (ds_results) { @@ -168,6 +166,8 @@ async function load_data_store( // Set the loaded_on datetime to the current time for reference later. This will be used to determine if the data store is stale. $ae_ds_loc.loaded_on = new Date().toISOString(); + // Set the chk_account_id as a backup check to make sure the data store belongs to the account for the current site. This should not be needed, but here we are... + $ae_ds_loc.chk_account_id = $ae_loc.account_id; $ae_ds_loc.id = ds_results.data_store_id_random; $ae_ds_loc.account_id = ds_results.account_id_random; @@ -677,37 +677,37 @@ async function handle_update__data_store({ - {#if !$ae_ds_loc.type && !$ae_ds_loc.html && !$ae_ds_loc.json && !$ae_ds_loc.md && !$ae_ds_loc.text} - No data found! Is the data store correct or new? - {/if} +{#if !$ae_ds_loc.type && !$ae_ds_loc.html && !$ae_ds_loc.json && !$ae_ds_loc.md && !$ae_ds_loc.text} + No data found! Is the data store correct or new? +{/if} - {#if $ae_ds_loc.type == 'html' && $ae_ds_loc.html} - {@html $ae_ds_loc.html} - {:else if $ae_ds_loc.type == 'html'} - No HTML found! Is the data store type correct? - {/if} +{#if $ae_ds_loc.type == 'html' && $ae_ds_loc.html} + {@html $ae_ds_loc.html} +{:else if $ae_ds_loc.type == 'html'} + No HTML found! Is the data store type correct? +{/if} - {#if $ae_ds_loc.type == 'text' && $ae_ds_loc.text} - {$ae_ds_loc.text} - {:else if $ae_ds_loc.type == 'text'} - No text found! Is the data store type correct? - {/if} +{#if $ae_ds_loc.type == 'text' && $ae_ds_loc.text} + {$ae_ds_loc.text} +{:else if $ae_ds_loc.type == 'text'} + No text found! Is the data store type correct? +{/if} - + {:else} diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index db4f7e22..e25c3739 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -52,8 +52,6 @@ storePopup.set({ computePosition, autoUpdate, flip, shift, offset, arrow }); import { api } from '$lib/api'; import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; -$ae_loc = data.ae_loc; -$ae_api = data.ae_api; import { events_loc, events_slct } from '$lib/ae_events_stores'; import type { key_val } from '$lib/ae_stores'; // console.log($ae_loc, $ae_sess, $ae_api); @@ -62,11 +60,11 @@ import Element_access_type from '$lib/element_access_type.svelte'; import Element_app_cfg from '$lib/element_app_cfg.svelte'; import Element_data_store from '$lib/element_data_store.svelte'; +// Quickly save the data passed from the parent to the Svelte stores. +$ae_loc = data.ae_loc; +$ae_api = data.ae_api; -if (data.url.searchParams.get('event_id')) { - $events_slct.event_id = data.url.searchParams.get('event_id'); - $events_loc.event_id = data.url.searchParams.get('event_id'); -} else if ($ae_loc.site_cfg_json.slct__event_id) { +if ($ae_loc.site_cfg_json.slct__event_id) { $events_slct.event_id = $ae_loc.site_cfg_json.slct__event_id; $events_loc.event_id = $ae_loc.site_cfg_json.slct__event_id; } else if ($events_slct.event_id) { @@ -79,11 +77,23 @@ if (data.url.searchParams.get('event_id')) { console.log(`No Event ID set.`); } +// We want to loop through all of the data store (ds) key value pairs and set them to localStorage +if (data.ae_ds) { + for (let [key, value] of Object.entries(data.ae_ds)) { + console.log(`ae_ds__ key: ${key}, value:`, value); + localStorageStore(`ae_ds__${key}`, value); + } +} + onMount(() => { // console.log('Root: +layout.svelte'); - if ($ae_loc.iframe) { + + let iframe = data.url.searchParams.get('iframe'); + if (iframe == 'true') { console.log('Use iframe layout!'); + // data_struct['iframe'] = iframe; + $ae_loc.iframe = true; document.getElementsByTagName('html')[0].classList.add('iframe'); document.getElementsByTagName('html')[0].classList.remove('dark'); @@ -91,13 +101,29 @@ onMount(() => { $ae_loc.hub.show_element__access_type = false; $ae_loc.hub.show_element__cfg = false; - } else if ($ae_loc.trusted_access) { + } else if (iframe == 'false') { + // data_struct['iframe'] = false; + $ae_loc.iframe = false; + + document.getElementsByTagName('html')[0].classList.remove('iframe'); + document.getElementsByTagName('html')[0].classList.add('light'); + } + + if (!$ae_loc.iframe && $ae_loc.trusted_access) { + $ae_loc.hub.show_element__access_type = true; + $ae_loc.hub.show_element__cfg = true; + } else if ($ae_loc.iframe && $ae_loc.administrator_access) { $ae_loc.hub.show_element__access_type = true; $ae_loc.hub.show_element__cfg = true; } else { $ae_loc.hub.show_element__access_type = true; $ae_loc.hub.show_element__cfg = false; } + + if (data.url.searchParams.get('event_id')) { + $events_slct.event_id = data.url.searchParams.get('event_id'); + $events_loc.event_id = data.url.searchParams.get('event_id'); + } }); @@ -171,17 +197,9 @@ $: if ($slct_trigger == 'set_access_code_li' && !$ae_loc.ds['hub__page__access_c ds_type="html" display="block" /> - - - @@ -270,7 +258,6 @@ $: if ($slct_trigger == 'set_access_code_li' && !$ae_loc.ds['hub__page__access_c class="flex text-sm sm:text-sm md:text-md lg:text-md xl:text-md 2xl:text-lg text-slate-400 hover:text-slate-800 transition px-1" class:ae_debug={$ae_loc.debug} > - /** @type {import('./$types').LayoutData} */ -export let data; +export let data: any; import { goto } from '$app/navigation'; import type { Writable } from 'svelte/store'; import { localStorageStore } from '@skeletonlabs/skeleton'; @@ -10,6 +10,7 @@ import type { key_val } from '$lib/ae_stores'; import { api } from '$lib/api'; import { ae_loc, ae_sess, ae_api, slct } from '$lib/ae_stores'; import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores'; + import { onMount } from 'svelte'; // import Element_data_store from '$lib/element_data_store.svelte'; @@ -19,15 +20,15 @@ import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores'; 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) { +if (data.ae_loc.site_cfg_json.slct__event_id) { $events_slct.event_id = data.ae_loc.site_cfg_json.slct__event_id; + $events_loc.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; + $events_loc.event_id = $events_loc.default__event_id; } else if ($events_slct.event_id) { console.log(`Event ID already set:`, $events_slct.event_id); + $events_loc.event_id = $events_slct.event_id; } else { console.log(`No Event ID set.`); } @@ -55,6 +56,13 @@ $: if ($events_trigger == 'load__event_obj' && $events_slct.event_id) { } +onMount(() => { + if (data.url.searchParams.get('event_id')) { + $events_slct.event_id = data.url.searchParams.get('event_id'); + $events_loc.event_id = data.url.searchParams.get('event_id'); + } +}); + // Updated 2024-03-06 async function handle_load_ae_obj_id__event({event_id, try_cache=false}) { console.log(`*** handle_load_ae_obj_id__event() *** event_id=${event_id} api_cfg=`, $ae_api); diff --git a/src/routes/events_badges/+layout.ts b/src/routes/events_badges/+layout.ts index eb7d6805..cb308cac 100644 --- a/src/routes/events_badges/+layout.ts +++ b/src/routes/events_badges/+layout.ts @@ -40,3 +40,6 @@ export async function load({ params, parent, url }) { // route return data; } + +// export const prerender = false; +export const prerender = true; \ No newline at end of file diff --git a/src/routes/events_badges/+page.svelte b/src/routes/events_badges/+page.svelte index 79aef81a..54debd7e 100644 --- a/src/routes/events_badges/+page.svelte +++ b/src/routes/events_badges/+page.svelte @@ -1,7 +1,7 @@ diff --git a/src/routes/events_speakers/+layout.ts b/src/routes/events_speakers/+layout.ts index 41595b67..81a7594a 100644 --- a/src/routes/events_speakers/+layout.ts +++ b/src/routes/events_speakers/+layout.ts @@ -1,54 +1,66 @@ /** @type {import('./$types').LayoutLoad} */ +console.log(`ae_events_speakers +layout.ts start`); 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 { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores'; +// import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { events_func } from '$lib/ae_events_functions'; export async function load({ params, parent, url }) { // route - // console.log(`Svelte Event Speakers layout.ts data = params:`, params); - // console.log(`Svelte Event Speakers layout.ts data = route:`, route); - // console.log(`Svelte Event Speakers layout.ts data = url:`, url); let data = await parent(); - console.log(`Svelte Events Speakers layout.ts data = data:`, data); data.ae_events_speakers_layout_ts = true; - - let event_id = url.searchParams.get('event_id'); - if (!event_id) { - // event_id = $ae_loc.site_cfg_json.slct__event_id; - event_id = data.ae_loc.site_cfg_json.slct__event_id; + if (data.ae_loc.account_id) { + } else { + console.log(`The account_id was not found in the data.ae_loc!!!`); + return false; } - await handle_load_ae_obj_id__event({event_id: event_id, try_cache: false}) - .then(function (event_obj_results) { - if (event_obj_results) { - console.log(`event_obj_results = `, event_obj_results); + let event_id = null; + if (data.ae_loc.site_cfg_json.slct__event_id) { + event_id = data.ae_loc.site_cfg_json.slct__event_id; + } else if (data.ae_loc.default__event_id) { + event_id = data.ae_loc.default__event_id; + } else { + console.log(`The event_id was not found in the data.ae_loc.site_cfg_json!!!`); + return false; + } - let ae_loc_tmp = get(ae_loc); - ae_loc_tmp.event_id = event_obj_results.event_id_random; - ae_loc_tmp.mod.events.event_id = event_obj_results.event_id_random; - ae_loc.set(ae_loc_tmp); - console.log(`ae_loc = `, get(ae_loc)); + let load_event_obj = events_func.handle_load_ae_obj_id__event({api_cfg: data.ae_api, event_id: event_id, try_cache: false}); - let slct_tmp = get(slct); - slct_tmp.event_id = event_obj_results.event_id_random; - slct_tmp.event_obj = event_obj_results; - slct.set(slct_tmp); - console.log(`slct = `, get(slct)); + data.ae_slct.event_id = event_id; + data.ae_slct.event_obj = await load_event_obj; - let slct_trigger_tmp = get(slct_trigger); - slct_trigger_tmp = 'load__event_presenter_obj_li'; - slct_trigger.set(slct_trigger_tmp); - console.log(`slct_trigger = `, get(slct_trigger)); - } + // await handle_load_ae_obj_id__event({event_id: event_id, try_cache: false}) + // .then(function (event_obj_results) { + // if (event_obj_results) { + // console.log(`event_obj_results = `, event_obj_results); - return event_obj_results; - }) + // let ae_loc_tmp = get(ae_loc); + // ae_loc_tmp.event_id = event_obj_results.event_id_random; + // ae_loc_tmp.mod.events.event_id = event_obj_results.event_id_random; + // ae_loc.set(ae_loc_tmp); + // console.log(`ae_loc = `, get(ae_loc)); + + // let slct_tmp = get(slct); + // slct_tmp.event_id = event_obj_results.event_id_random; + // slct_tmp.event_obj = event_obj_results; + // slct.set(slct_tmp); + // console.log(`slct = `, get(slct)); + + // let slct_trigger_tmp = get(slct_trigger); + // slct_trigger_tmp = 'load__event_presenter_obj_li'; + // slct_trigger.set(slct_trigger_tmp); + // console.log(`slct_trigger = `, get(slct_trigger)); + // } + + // return event_obj_results; + // }) let ds_code_li = {}; //: key_val; // = ae_loc_tmp.ds; @@ -63,7 +75,7 @@ export async function load({ params, parent, url }) { // route api_cfg: get(ae_api), data_store_code: ds_code, data_type: ds_type, - log_lvl: 2 + log_lvl: 1 }) .then( function (ds_results) { console.log(`ae_ Data Store ${ds_code} = `, ds_results); @@ -89,7 +101,7 @@ export async function load({ params, parent, url }) { // route api_cfg: get(ae_api), data_store_code: ds_code, data_type: ds_type, - log_lvl: 2 + log_lvl: 1 }) .then( function (ds_results) { console.log(`ae_ Data Store ${ds_code} = `, ds_results); @@ -109,22 +121,25 @@ export async function load({ params, parent, url }) { // route }); - let ae_loc_tmp = get(ae_loc); - console.log(`ae_loc = `, ae_loc_tmp); + // let ae_loc_tmp = get(ae_loc); + // console.log(`ae_loc = `, ae_loc_tmp); - let ae_ds_tmp = ae_loc_tmp.ds; - // Merge the new data into the existing data - ae_ds_tmp = { - ...ae_ds_tmp, - ...ds_code_li, - } + // let ae_ds_tmp = ae_loc_tmp.ds; + // // Merge the new data into the existing data + // // ae_ds_tmp = { + // // ...ae_ds_tmp, + // // ...ds_code_li, + // // } - ae_loc_tmp = { - ...ae_loc_tmp, - 'ds': ae_ds_tmp, - } - console.log(`ae_loc = `, ae_loc_tmp); - ae_loc.set(ae_loc_tmp); + // // ae_loc_tmp = { + // // ...ae_loc_tmp, + // // 'ds': ae_ds_tmp, + // // } + + // // console.log(`ae_loc = `, ae_loc_tmp); + // data['ae_loc'] = ae_loc_tmp; + + data['ae_ds'] = ds_code_li; // return data_struct; return data; @@ -144,32 +159,34 @@ export async function load({ params, parent, url }) { // route } -function handle_load_ae_obj_id__event({event_id, try_cache=false}) { - console.log(`*** handle_load_ae_obj_id__event() *** event_id=${event_id}`); +// function handle_load_ae_obj_id__event({event_id, try_cache=false}) { +// console.log(`*** handle_load_ae_obj_id__event() *** event_id=${event_id}`); - let params = {}; +// let params = {}; - // ae_loc.hub.event_id_qry_status = 'loading'; - let ae_event_obj_get_promise = api.get_ae_obj_id_crud({ - api_cfg: get(ae_api), - obj_type: 'event', - obj_id: event_id, // NOTE: This is the FQDN, not normally the ID. - use_alt_table: false, // NOTE: This will use the table_name_alt value instead of the table_name value in the API config. - use_alt_base: false, // NOTE: This will use the base_name_alt value instead of the base_name value in the API config. - params: params, - log_lvl: 0 - }) - .then(function (event_obj_get_result) { - if (event_obj_get_result) { - return event_obj_get_result; - } else { - console.log('No results returned.'); - return null; - } - }) - .catch(function (error) { - console.log('No results returned or failed.', error); - }); +// // ae_loc.hub.event_id_qry_status = 'loading'; +// let ae_event_obj_get_promise = api.get_ae_obj_id_crud({ +// api_cfg: get(ae_api), +// obj_type: 'event', +// obj_id: event_id, // NOTE: This is the FQDN, not normally the ID. +// use_alt_table: false, // NOTE: This will use the table_name_alt value instead of the table_name value in the API config. +// use_alt_base: false, // NOTE: This will use the base_name_alt value instead of the base_name value in the API config. +// params: params, +// log_lvl: 0 +// }) +// .then(function (event_obj_get_result) { +// if (event_obj_get_result) { +// return event_obj_get_result; +// } else { +// console.log('No results returned.'); +// return null; +// } +// }) +// .catch(function (error) { +// console.log('No results returned or failed.', error); +// }); - return ae_event_obj_get_promise; -} +// return ae_event_obj_get_promise; +// } + +export const prerender = true; \ No newline at end of file diff --git a/src/routes/sponsorships/+layout.svelte b/src/routes/sponsorships/+layout.svelte index 54b0632e..c3429cf0 100644 --- a/src/routes/sponsorships/+layout.svelte +++ b/src/routes/sponsorships/+layout.svelte @@ -1,6 +1,42 @@ diff --git a/src/routes/sponsorships/+layout.ts b/src/routes/sponsorships/+layout.ts index 1efff32a..47ac8493 100644 --- a/src/routes/sponsorships/+layout.ts +++ b/src/routes/sponsorships/+layout.ts @@ -1,23 +1,41 @@ /** @type {import('./$types').LayoutLoad} */ +console.log(`ae_sponsorships +layout.ts start`); 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 type { key_val } from '$lib/ae_stores'; +import { spons_func } from '$lib/ae_sponsorships_functions'; export async function load({ params, parent, url }) { // route - // console.log(`Svelte Sponsorships +layout.ts data.params:`, params); - // console.log(`Svelte Sponsorships +layout.ts data.route:`, route); - // console.log(`Svelte Sponsorships +layout.ts data.url:`, url); - // const { ae_init, root_layout_ts } = await parent(); let data = await parent(); - // console.log(`ae_events_badges +layout.ts data:`, data); data.ae_sponsorships_layout_ts = true; + if (data.ae_loc.account_id) { + } else { + console.log(`The account_id was not found in the data.ae_loc!!!`); + return false; + } + + let sponsorship_cfg_id = null; + if (data.ae_loc.site_cfg_json.slct__sponsorship_cfg_id) { + sponsorship_cfg_id = data.ae_loc.site_cfg_json.slct__sponsorship_cfg_id; + // } else if (data.ae_loc.default__sponsorship_cfg_id) { + // sponsorship_cfg_id = data.ae_loc.default__sponsorship_cfg_id; + } else { + console.log(`The sponsorship_cfg_id was not found in the data.ae_loc.site_cfg_json!!!`); + return false; + } + + let load_sponsorship_cfg_obj = spons_func.handle_load_ae_obj_id__sponsorship_cfg({api_cfg: data.ae_api, sponsorship_cfg_id: sponsorship_cfg_id, try_cache: false}); + + data.ae_slct.sponsorship_cfg_id = sponsorship_cfg_id; + data.ae_slct.sponsorship_cfg_obj = await load_sponsorship_cfg_obj; + let ds_code_li = {}; //: key_val; // = ae_loc_tmp.ds; @@ -45,7 +63,7 @@ export async function load({ params, parent, url }) { // route ds_type = 'text'; ds_code_li[ds_code] = await api.get_data_store_obj_w_code({ - api_cfg: get(ae_api), + api_cfg: data.ae_api, data_store_code: ds_code, data_type: ds_type, log_lvl: 2 @@ -88,7 +106,7 @@ export async function load({ params, parent, url }) { // route ds_type = 'text'; ds_code_li[ds_code] = await api.get_data_store_obj_w_code({ - api_cfg: get(ae_api), + api_cfg: data.ae_api, data_store_code: ds_code, data_type: ds_type, log_lvl: 2 @@ -128,23 +146,31 @@ export async function load({ params, parent, url }) { // route }); console.log(`ae_ ds_code_li = `, ds_code_li); - let ae_loc_tmp = get(ae_loc); - console.log(`ae_loc = `, ae_loc_tmp); + // let ae_loc_tmp = get(ae_loc); + // console.log(`ae_loc = `, ae_loc_tmp); - let ae_ds_tmp = ae_loc_tmp.ds; - // Merge the new data into the existing data - ae_ds_tmp = { - ...ae_ds_tmp, - ...ds_code_li, - } + // let ae_ds_tmp = ae_loc_tmp.ds; + // // Merge the new data into the existing data + // // ae_ds_tmp = { + // // ...ae_ds_tmp, + // // ...ds_code_li, + // // } - ae_loc_tmp = { - ...ae_loc_tmp, - 'ds': ae_ds_tmp, - } - console.log(`ae_loc = `, ae_loc_tmp); - ae_loc.set(ae_loc_tmp); + // // ae_loc_tmp = { + // // ...ae_loc_tmp, + // // 'ds': ae_ds_tmp, + // // } + // // console.log(`ae_loc = `, ae_loc_tmp); + // // ae_loc.set(ae_loc_tmp); + + // // console.log(`ae_loc_tmp = `, ae_loc_tmp); + // data['ae_loc'] = ae_loc_tmp; + + data['ae_ds'] = ds_code_li; // return data_struct; return data; } + +// export const prerender = false; +export const prerender = true; \ No newline at end of file diff --git a/src/routes/sponsorships/+page.svelte b/src/routes/sponsorships/+page.svelte index 5ac38ce8..7a72b2eb 100644 --- a/src/routes/sponsorships/+page.svelte +++ b/src/routes/sponsorships/+page.svelte @@ -223,90 +223,90 @@ async function handle_load_ae_obj_li__sponsorship({account_id, try_cache=true}) // Load the Sponsorship Cfg Obj with ID based on the URL param. -if (data.url.searchParams.get('sponsorship_cfg_id')) { - $slct.sponsorship_cfg_id = data.url.searchParams.get('sponsorship_cfg_id'); - $slct_trigger = 'load__sponsorship_cfg_obj'; -} else { - $slct.sponsorship_cfg_id = $ae_loc.mod.sponsorships.cfg_id; -} -$slct_trigger = 'load__sponsorship_cfg_obj'; +// if (data.url.searchParams.get('sponsorship_cfg_id')) { +// $slct.sponsorship_cfg_id = data.url.searchParams.get('sponsorship_cfg_id'); +// $slct_trigger = 'load__sponsorship_cfg_obj'; +// } else { +// $slct.sponsorship_cfg_id = $ae_loc.mod.sponsorships.cfg_id; +// } +// $slct_trigger = 'load__sponsorship_cfg_obj'; -$: if ($slct_trigger == 'load__sponsorship_cfg_obj' && $slct.sponsorship_cfg_id) { - console.log('Selected Sponsorship Cfg ID:', $slct.sponsorship_cfg_id); +// $: if ($slct_trigger == 'load__sponsorship_cfg_obj' && $slct.sponsorship_cfg_id) { +// console.log('Selected Sponsorship Cfg ID:', $slct.sponsorship_cfg_id); - $slct_trigger = null; +// $slct_trigger = null; - $ae_loc.mod.sponsorships.cfg_id = $slct.sponsorship_cfg_id; +// $ae_loc.mod.sponsorships.cfg_id = $slct.sponsorship_cfg_id; - handle_load_ae_obj_id__sponsorship_cfg({sponsorship_cfg_id: $slct.sponsorship_cfg_id, try_cache: false}); -} +// handle_load_ae_obj_id__sponsorship_cfg({sponsorship_cfg_id: $slct.sponsorship_cfg_id, try_cache: false}); +// } -async function handle_load_ae_obj_id__sponsorship_cfg({sponsorship_cfg_id, try_cache=false}) { - console.log(`*** handle_load_ae_obj_id__sponsorship_cfg() *** sponsorship_cfg_id=${sponsorship_cfg_id}`); +// async function handle_load_ae_obj_id__sponsorship_cfg({sponsorship_cfg_id, try_cache=false}) { +// console.log(`*** handle_load_ae_obj_id__sponsorship_cfg() *** sponsorship_cfg_id=${sponsorship_cfg_id}`); - let params = {}; +// let params = {}; - // $ae_loc.mod.sponsorships.qry_status = 'loading'; - ae_sponsorship_cfg_obj_get_promise = api.get_ae_obj_id_crud({ - api_cfg: $ae_api, - obj_type: 'sponsorship_cfg', - obj_id: sponsorship_cfg_id, - use_alt_table: false, // NOTE: This will use the table_name_alt value instead of the table_name value in the API config. - use_alt_base: false, // NOTE: This will use the base_name_alt value instead of the base_name value in the API config. - params: params, - log_lvl: 1 - }) - .then(function (sponsorship_cfg_obj_get_result) { - if (sponsorship_cfg_obj_get_result) { - $slct.sponsorship_cfg_obj = sponsorship_cfg_obj_get_result; - console.log(`sponsorship_cfg object:`, $slct.sponsorship_cfg_obj); - } +// // $ae_loc.mod.sponsorships.qry_status = 'loading'; +// ae_sponsorship_cfg_obj_get_promise = api.get_ae_obj_id_crud({ +// api_cfg: $ae_api, +// obj_type: 'sponsorship_cfg', +// obj_id: sponsorship_cfg_id, +// use_alt_table: false, // NOTE: This will use the table_name_alt value instead of the table_name value in the API config. +// use_alt_base: false, // NOTE: This will use the base_name_alt value instead of the base_name value in the API config. +// params: params, +// log_lvl: 1 +// }) +// .then(function (sponsorship_cfg_obj_get_result) { +// if (sponsorship_cfg_obj_get_result) { +// $slct.sponsorship_cfg_obj = sponsorship_cfg_obj_get_result; +// console.log(`sponsorship_cfg object:`, $slct.sponsorship_cfg_obj); +// } - // Auto show the selected sponsorship ID - // Is this pushState needed here? - // Set the URL param "sponsorship_cfg_id" to the current sponsorship ID. - // const url = new URL(location); - // url.searchParams.set('sponsorship_cfg_id', $slct.sponsorship_cfg_id); - // history.pushState({}, '', url); +// // Auto show the selected sponsorship ID +// // Is this pushState needed here? +// // Set the URL param "sponsorship_cfg_id" to the current sponsorship ID. +// // const url = new URL(location); +// // url.searchParams.set('sponsorship_cfg_id', $slct.sponsorship_cfg_id); +// // history.pushState({}, '', url); - // Is this postMessage needed here? - // let message = {'sponsorship_cfg_id': $slct.sponsorship_cfg_id}; - // window.parent.postMessage(message, "*"); +// // Is this postMessage needed here? +// // let message = {'sponsorship_cfg_id': $slct.sponsorship_cfg_id}; +// // window.parent.postMessage(message, "*"); - // modalStore.trigger(modal_view__sponsorship_cfg_obj); - }) - .catch(function (error) { - console.log('No results returned or failed.', error); - }) - .finally(function () { - // For CHOW 2024 only - $ae_loc.mod.sponsorships.level_guest_max_li = { - 0: 0, - 1: 4, // CHOW 2024 - Friend - 2: 8, // CHOW 2024 - Supporter - 3: 8, // CHOW 2024 - Advocate - 4: 8, // CHOW 2024 - Champion - 5: 8, // CHOW 2024 - Presenting Partner - 6: 16, // CHOW 2024 - Signature Partner - 7: 16, // CHOW 2024 - Premier Partner - }; - // $ae_loc.mod.sponsorships.level_guest_max_li = { - // '0': 0, - // '1': 4, - // '2': 8, - // '3': 8, - // '4': 8, - // '5': 16, // This is a guess for CHOW 2024!!! - // '6': 16, // This is a guess for CHOW 2024!!! - // }; - // if ($slct.sponsorship_cfg_obj.info_about_levels) { - // $slct.sponsorship_cfg_obj.info_about_levels = JSON.parse($slct.sponsorship_cfg_obj.info_about_levels); - // } - // $ae_loc.hub.sponsorship_cfg_id_qry_status = 'done'; - }); +// // modalStore.trigger(modal_view__sponsorship_cfg_obj); +// }) +// .catch(function (error) { +// console.log('No results returned or failed.', error); +// }) +// .finally(function () { +// // For CHOW 2024 only +// $ae_loc.mod.sponsorships.level_guest_max_li = { +// 0: 0, +// 1: 4, // CHOW 2024 - Friend +// 2: 8, // CHOW 2024 - Supporter +// 3: 8, // CHOW 2024 - Advocate +// 4: 8, // CHOW 2024 - Champion +// 5: 8, // CHOW 2024 - Presenting Partner +// 6: 16, // CHOW 2024 - Signature Partner +// 7: 16, // CHOW 2024 - Premier Partner +// }; +// // $ae_loc.mod.sponsorships.level_guest_max_li = { +// // '0': 0, +// // '1': 4, +// // '2': 8, +// // '3': 8, +// // '4': 8, +// // '5': 16, // This is a guess for CHOW 2024!!! +// // '6': 16, // This is a guess for CHOW 2024!!! +// // }; +// // if ($slct.sponsorship_cfg_obj.info_about_levels) { +// // $slct.sponsorship_cfg_obj.info_about_levels = JSON.parse($slct.sponsorship_cfg_obj.info_about_levels); +// // } +// // $ae_loc.hub.sponsorship_cfg_id_qry_status = 'done'; +// }); - return ae_sponsorship_cfg_obj_get_promise; -} +// return ae_sponsorship_cfg_obj_get_promise; +// } // Load the Sponsorship Obj with ID based on the URL param. diff --git a/src/routes/sponsorships/+page.ts b/src/routes/sponsorships/+page.ts index 86d95ffb..80057428 100644 --- a/src/routes/sponsorships/+page.ts +++ b/src/routes/sponsorships/+page.ts @@ -1,10 +1,8 @@ /** @type {import('./$types').PageLoad} */ +console.log(`ae_sponsorships +page.ts start`); + export function load() { return { ae_sponsorships_page_ts: true, }; } - -// export const prerender = true -// export const prerender = false; -// export const trailingSlash = 'always'; // 'never' | 'always' | 'ignore' diff --git a/src/routes/sponsorships/[slug]/+layout.ts b/src/routes/sponsorships/[slug]/+layout.ts index 17751e58..b9160add 100644 --- a/src/routes/sponsorships/[slug]/+layout.ts +++ b/src/routes/sponsorships/[slug]/+layout.ts @@ -12,38 +12,67 @@ export async function load({ params, url }) { // route // console.log(`Svelte Sponsorships layout.ts data = route:`, route); // console.log(`Svelte Sponsorships layout.ts data = url:`, url); - let ae_loc_tmp = get(ae_loc); - console.log(`ae_loc = `, ae_loc_tmp); + // let ae_loc_tmp = get(ae_loc); + // console.log(`ae_loc = `, ae_loc_tmp); - let ds_code_li: null|key_val = ae_loc_tmp.ds; - console.log(`ae_ ds_code_li = `, ds_code_li); - let ds_code: null|string = null; - let ds_type: null|string = null; + // let ds_code_li: null|key_val = ae_loc_tmp.ds; + // console.log(`ae_ ds_code_li = `, ds_code_li); + // let ds_code: null|string = null; + // let ds_type: null|string = null; - let data_struct = { - ae_init: ae_loc_tmp, - params: params, - sections: [ - { slug: 'new', title: 'New Sponsorship' }, - { slug: 'manage', title: 'Manage' }, - { slug: 'test', title: 'Test' }, - ], - url: url, + // let data_struct = { + // ae_init: ae_loc_tmp, + // params: params, + // sections: [ + // { slug: 'new', title: 'New Sponsorship' }, + // { slug: 'manage', title: 'Manage' }, + // { slug: 'test', title: 'Test' }, + // ], + // url: url, - }; + // }; - let loading_results = null; + // let loading_results = null; - ds_code = 'hub__page__sponsorships__create_info'; - ds_type = 'text'; - // loading_results = await handle_get_data_store_obj_w_code({ code: ds_code }) - // .then( function (ds_hub_page_sponsorships_create_info_results) { - // if (ds_hub_page_sponsorships_create_info_results) { - // console.log(`ae_ hub__page__sponsorships__create_info = `, ds_hub_page_sponsorships_create_info_results); + // ds_code = 'hub__page__sponsorships__create_info'; + // ds_type = 'text'; + // // loading_results = await handle_get_data_store_obj_w_code({ code: ds_code }) + // // .then( function (ds_hub_page_sponsorships_create_info_results) { + // // if (ds_hub_page_sponsorships_create_info_results) { + // // console.log(`ae_ hub__page__sponsorships__create_info = `, ds_hub_page_sponsorships_create_info_results); + // // // let ae_loc_tmp = get(ae_loc); + + // // ds_code_li[ds_code] = ds_hub_page_sponsorships_create_info_results; + + // // // ae_loc.set(ae_loc_tmp); + // // // console.log(`ae_loc = `, get(ae_loc)); + // // } + // // }) + // // .finally(function () { + // // console.log(`ae_ ds_code_li = `, ds_code_li); + // // ae_loc_tmp = { + // // ...ae_loc_tmp, + // // 'ds': ds_code_li, + // // } + // // console.log(`ae_loc_tmp = `, ae_loc_tmp); + + // // ae_loc.set(ae_loc_tmp); + // // console.log(`ae_loc = `, get(ae_loc)); + // // }); + + // loading_results = await api.get_data_store_obj_w_code({ + // api_cfg: get(ae_api), + // data_store_code: ds_code, + // data_type: ds_type, + // log_lvl: 0 + // }) + // .then( function (ds_results) { + // if (ds_results) { + // console.log(`ae_ Data Store ${ds_code} = `, ds_results); // // let ae_loc_tmp = get(ae_loc); - // ds_code_li[ds_code] = ds_hub_page_sponsorships_create_info_results; + // ds_code_li[ds_code] = ds_results.text; // // ae_loc.set(ae_loc_tmp); // // console.log(`ae_loc = `, get(ae_loc)); @@ -61,77 +90,5 @@ export async function load({ params, url }) { // route // console.log(`ae_loc = `, get(ae_loc)); // }); - loading_results = await api.get_data_store_obj_w_code({ - api_cfg: get(ae_api), - data_store_code: ds_code, - data_type: ds_type, - log_lvl: 0 - }) - .then( function (ds_results) { - if (ds_results) { - console.log(`ae_ Data Store ${ds_code} = `, ds_results); - // let ae_loc_tmp = get(ae_loc); - - ds_code_li[ds_code] = ds_results.text; - - // ae_loc.set(ae_loc_tmp); - // console.log(`ae_loc = `, get(ae_loc)); - } - }) - .finally(function () { - console.log(`ae_ ds_code_li = `, ds_code_li); - ae_loc_tmp = { - ...ae_loc_tmp, - 'ds': ds_code_li, - } - console.log(`ae_loc_tmp = `, ae_loc_tmp); - - ae_loc.set(ae_loc_tmp); - console.log(`ae_loc = `, get(ae_loc)); - }); - - return data_struct; + // return data_struct; } - - - - - -// async function handle_get_data_store_obj_w_code({ code=null, data_type='text' }) { -// console.log(`*** handle_get_data_store_obj_w_code() *** code=${code}`); - -// if (!code) { -// console.log('No code provided.'); -// return; -// } - -// let data_store_obj_get_promise = api.get_data_store_obj_w_code({ -// api_cfg: get(ae_api), -// data_store_code: code, -// data_type: data_type, -// log_lvl: 0 -// }) -// .then(function (get_data_store_result) { -// let return_this = null; -// if (get_data_store_result) { - -// if (data_type == 'text') { -// // console.log(get_data_store_result.text); -// return_this = get_data_store_result.text; -// } else if (data_type == 'json') { -// // console.log(get_data_store_result.json); -// return_this = get_data_store_result.json; -// } - -// } else { -// console.log('No results returned.'); -// return_this = null; -// } -// return return_this; -// }) -// .catch(function (error) { -// console.log('No results returned or failed.', error); -// }); - -// return data_store_obj_get_promise; -// }