Trying to make things work better...

This commit is contained in:
Scott Idem
2024-03-26 14:24:35 -04:00
parent 040e1e71e3
commit 4d486a580c
22 changed files with 508 additions and 410 deletions

View File

@@ -1,6 +1,31 @@
<script lang="ts">
/** @type {import('./$types').LayoutData} */
export let data;
export let data: any;
import { onMount } from 'svelte';
import { localStorageStore } from '@skeletonlabs/skeleton';
import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
// Quickly save the data passed from the parent to the Svelte stores.
$ae_loc = data.ae_loc;
$ae_loc.mod.events.event_id = data.ae_slct.event_id;
$ae_loc.mod.events.event_obj = data.ae_slct.event_obj;
// 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(() => {
if (data.url.searchParams.get('event_id')) {
$slct.event_id = data.url.searchParams.get('event_id');
$ae_loc.mod.events.event_id = data.url.searchParams.get('event_id');
}
});
</script>

View File

@@ -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;