Scott.Idem/OSIT-AE-App-Svelte
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

I guess this is better than it was...

Browse Source
This commit is contained in:
Scott Idem
2024-03-27 17:55:31 -04:00
parent 3082c07e3e
commit 8d8fb0b638
22 changed files with 582 additions and 443 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/routes/events_speakers/+layout.svelte
View File

@@ -6,10 +6,17 @@ 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;
// Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other.
// $slct.account_id = data.account_id;
console.log(`$slct.account_id = `, $slct.account_id);
let ae_acct = data[$slct.account_id];
console.log(`ae_acct = `, ae_acct);
// $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;
// $events_slct.event_id = ae_acct.slct.event_id
// $events_slct.event_obj = ae_acct.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) {
@@ -20,6 +27,7 @@ if (data.ae_ds) {
}
onMount(() => {
console.log(`$slct.event_id = `, $slct.event_id);
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');
@@ -30,7 +38,7 @@ onMount(() => {
<svelte:head>
<title>Speaker Hub - {data.ae_loc.title}</title>
<title>Speaker Hub - {$ae_loc.title ?? 'Æ loading...'}</title>
</svelte:head>

190
src/routes/events_speakers/+layout.ts
View File

@@ -1,68 +1,41 @@
/** @type {import('./$types').LayoutLoad} */
console.log(`ae_events_speakers +layout.ts start`);
import { get } from 'svelte/store';
// import { get } from 'svelte/store';
// import { browser } from '$app/environment';
import { api } from '$lib/api';
import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
// import { api } from '$lib/api';
// import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
import { core_func } from '$lib/ae_core_functions';
// 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
export async function load({ parent }) {
let data = await parent();
let account_id = data.account_id;
let ae_acct = data[account_id];
console.log(`ae_acct = `, ae_acct);
if (!account_id) {
console.log(`events_speakers +layout.ts: The account_id was not found in the data!!!`);
return false;
}
let event_id = ae_acct.slct.event_id;
if (!event_id) {
console.log(`events_speakers +layout.ts: The event_id was not found in the data!!!`);
return false;
}
let load_event_obj = events_func.handle_load_ae_obj_id__event({api_cfg: ae_acct.api, event_id: event_id, try_cache: false});
ae_acct.slct.event_obj = load_event_obj;
data.ae_events_speakers_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 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 load_event_obj = events_func.handle_load_ae_obj_id__event({api_cfg: data.ae_api, event_id: event_id, try_cache: false});
data.ae_slct.event_id = event_id;
data.ae_slct.event_obj = await load_event_obj;
// 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 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;
// console.log(`ae_ ds_code_li = `, ds_code_li);
let ds_code: string = '';
@@ -71,58 +44,28 @@ export async function load({ params, parent, url }) { // route
ds_code = 'hub__page__events_speakers__create_info_header';
ds_type = 'text';
ds_code_li[ds_code] = await api.get_data_store_obj_w_code({
api_cfg: get(ae_api),
data_store_code: ds_code,
data_type: ds_type,
log_lvl: 1
})
.then( function (ds_results) {
console.log(`ae_ Data Store ${ds_code} = `, ds_results);
// ds_code_li[ds_code]
ae_acct['ds'][ds_code] = core_func.handle_load_ae_obj_code__data_store({api_cfg: ae_acct.api, code: ds_code, data_type: ds_type, save_idb: true})
.then(function (ds_results) {
if (ds_results) {
console.log(`ae_ Data Store ${ds_code} = `, ds_results);
if (ds_type == 'json') {
return ds_results.json;
} else {
return ds_results.text;
}
// console.log(`ae_ ds_results = `, ds_results);
return ds_results;
}
})
.finally(function (ds_code_val) {
console.log(`ae_ ds_code_val = `, ds_code_val);
return ds_code_val;
});
}
);
ds_code = 'hub__page__events_speakers__create_info';
ds_type = 'text';
ds_code_li[ds_code] = await api.get_data_store_obj_w_code({
api_cfg: get(ae_api),
data_store_code: ds_code,
data_type: ds_type,
log_lvl: 1
})
.then( function (ds_results) {
console.log(`ae_ Data Store ${ds_code} = `, ds_results);
// ds_code_li[ds_code]
ae_acct['ds'][ds_code] = core_func.handle_load_ae_obj_code__data_store({api_cfg: ae_acct.api, code: ds_code, data_type: ds_type, save_idb: true})
.then(function (ds_results) {
if (ds_results) {
console.log(`ae_ Data Store ${ds_code} = `, ds_results);
if (ds_type == 'json') {
return ds_results.json;
} else {
return ds_results.text;
}
// console.log(`ae_ ds_results = `, ds_results);
return ds_results;
}
})
.finally(function (ds_code_val) {
console.log(`ae_ ds_code_val = `, ds_code_val);
return ds_code_val;
});
// 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
@@ -139,54 +82,15 @@ export async function load({ params, parent, url }) { // route
// // console.log(`ae_loc = `, ae_loc_tmp);
// data['ae_loc'] = ae_loc_tmp;
data['ae_ds'] = ds_code_li;
data['ae_ds'] = {
...data['ae_ds'],
...ae_acct['ds']
}
// WARNING: Precaution against shared data between sites and sessions.
data[account_id] = ae_acct;
// return data_struct;
return data;
// let data_struct = {
// params: params,
// sections: [
// { slug: 'new', title: 'New Speaker' },
// { slug: 'manage', title: 'Manage' },
// { slug: 'test', title: 'Test' },
// ],
// url: url,
// };
// return data_struct;
}
// 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 = {};
// // 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;
// }
// export const prerender = true;
// export const prerender = true;

3
src/routes/events_speakers/+page.svelte
View File

@@ -1,5 +1,6 @@
<script lang="ts">
export let data;
export let data: any;
console.log(`ae_ Svelte Events Speakers +page data:`, data);
import { onMount } from 'svelte';

4
src/routes/events_speakers/[slug]/+layout.ts
View File

@@ -13,7 +13,7 @@ export async function load({ params, url }) { // route
// console.log(`Svelte Events Speakers layout.ts data = route:`, route);
// console.log(`Svelte Events Speakers layout.ts data = url:`, url);
let ae_loc_tmp = get(ae_loc);
// 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;
@@ -23,7 +23,7 @@ export async function load({ params, url }) { // route
let data_struct = {
ae_init: ae_loc_tmp,
// ae_init: ae_loc_tmp,
params: params,
sections: [
{ slug: 'new', title: 'New Event Presenter' },

3
src/routes/events_speakers/[slug]/+page.svelte
View File

@@ -1,5 +1,6 @@
<script lang="ts">
export let data;
export let data: any;
console.log(`ae_ Svelte Events Speakers [slug] +page data:`, data);
import { onMount } from 'svelte';