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

110
src/lib/ae_core_functions.ts
View File

@@ -1,3 +1,4 @@
import { browser } from '$app/environment';
import type { key_val } from '$lib/ae_stores'; import type { key_val } from '$lib/ae_stores';
import { api } from '$lib/api'; import { api } from '$lib/api';
@@ -56,7 +57,26 @@ async function handle_load_ae_obj_id__site_domain({ api_cfg, fqdn, try_cache=fal
} }
// handle_load_ae_obj_code__data_store // handle_load_ae_obj_code__data_store
async function handle_load_ae_obj_code__data_store({ api_cfg, code=null, data_type='text' }) { async function handle_load_ae_obj_code__data_store(
{
api_cfg,
code,
data_type='text',
for_type=null,
for_id=null,
try_cache=true,
save_idb=false
}: {
api_cfg: any,
code: string,
data_type: string,
for_type: string|null,
for_id: string|null,
try_cache: boolean,
save_idb: boolean
}
) {
console.log(`*** handle_get_data_store_obj_w_code() *** code=${code}`); console.log(`*** handle_get_data_store_obj_w_code() *** code=${code}`);
if (!code) { if (!code) {
@@ -75,16 +95,90 @@ async function handle_load_ae_obj_code__data_store({ api_cfg, code=null, data_ty
data_type: data_type, data_type: data_type,
log_lvl: 0 log_lvl: 0
}) })
.then(function (get_data_store_result) { .then(function (get_ds_result) {
let return_this = null; let return_this = null;
if (get_data_store_result) { if (get_ds_result) {
console.log(`Got a result for code ${code}`);
if (data_type == 'text') { if (!get_ds_result.data_store_id_random) {
// console.log(get_data_store_result.text); console.log('Something went wrong? No data store ID found.');
return_this = get_data_store_result.text; return false;
}
// let ae_ds_tmp: key_val = {};
let ds_code_obj =
{
id: null,
account_id: null,
code: code,
name: null,
type: data_type,
for_type: null, // for_type
for_id: null, // for_id
access_read: null, // 'super', 'administrator', 'trusted', 'anonymous'
access_write: null, // 'super', 'administrator', 'trusted', 'anonymous'
access_delete: null, // 'super', 'administrator', 'trusted', 'anonymous'
html: null,
json: null,
md: null,
text: null,
updated_on: null,
chk_account_id: api_cfg.account_id,
loaded_on: new Date().toISOString(),
};
let val_json: key_val;
let val_html: key_val;
let val_md: key_val;
let val_sql: key_val;
let val_text: string;
// Set the loaded_on datetime to the current time for reference later. This will be used to determine if the data store is stale.
// ds_code_obj.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...
// ds_code_obj.chk_account_id = api_cfg.account_id;
ds_code_obj.id = get_ds_result.data_store_id_random;
ds_code_obj.account_id = get_ds_result.account_id_random;
ds_code_obj.code = get_ds_result.code; // This will overwrite whatever was passed in.
ds_code_obj.name = get_ds_result.name;
ds_code_obj.type = get_ds_result.type; // This will overwrite whatever was passed in.
if (data_type == 'html') {
ds_code_obj.html = get_ds_result.text;
val_html = get_ds_result.text;
return_this = get_ds_result.html;
} else if (data_type == 'json') { } else if (data_type == 'json') {
// console.log(get_data_store_result.json); ds_code_obj.json = get_ds_result.json;
return_this = get_data_store_result.json; val_json = get_ds_result.json;
return_this = get_ds_result.json;
} else if (data_type == 'md') {
ds_code_obj.text = get_ds_result.text;
val_md = get_ds_result.text;
return_this = get_ds_result.text;
} else if (data_type == 'sql') {
ds_code_obj.text = get_ds_result.text;
val_sql = get_ds_result.text;
return_this = get_ds_result.text;
} else {
ds_code_obj.text = get_ds_result.text;
val_text = get_ds_result.text;
return_this = get_ds_result.text;
}
// if (data_type == 'text') {
// // console.log(get_ds_result.text);
// return_this = get_ds_result.text;
// } else if (data_type == 'json') {
// // console.log(get_ds_result.json);
// return_this = get_ds_result.json;
// }
if (save_idb) {
if (browser) {
console.log(`ae_ds__ key: ${code}, value:`, get_ds_result);
localStorage.setItem(`ae_ds__${code}`, JSON.stringify(get_ds_result));
} else {
console.log('No browser!!!');
}
} }
} else { } else {

2
src/lib/ae_events_stores.ts
View File

@@ -91,7 +91,7 @@ console.log(`AE Stores - App Events Local Storage Data:`, events_local_data_stru
// export let ae_loc = writable(events_local_data_struct); // export let ae_loc = writable(events_local_data_struct);
// This works and uses *local* storage: // This works and uses *local* storage:
export let events_loc: Writable<key_val> = localStorageStore('ae_ events_loc', events_local_data_struct); export let events_loc: Writable<key_val> = localStorageStore('ae_events_loc', events_local_data_struct);
// console.log(`AE Stores - App Local Storage Data:`, get(ae_loc)); // console.log(`AE Stores - App Local Storage Data:`, get(ae_loc));

16
src/lib/api.js
View File

@@ -92,8 +92,10 @@ export let get_object = async function get_object({api_cfg, endpoint='', headers
/* other custom settings */ /* other custom settings */
}); });
axios_api.defaults.headers = api_cfg['headers']; axios_api.defaults.headers = api_cfg['headers'];
console.log('axios_api.defaults.headers:', axios_api.defaults.headers); if (log_lvl) {
console.log('Additional headers:', headers); console.log('axios_api.defaults.headers:', axios_api.defaults.headers);
console.log('Additional headers:', headers);
}
// console.log('Clean the headers. No _underscores_!') // console.log('Clean the headers. No _underscores_!')
let headers_cleaned = {}; let headers_cleaned = {};
@@ -113,12 +115,16 @@ export let get_object = async function get_object({api_cfg, endpoint='', headers
} }
} }
headers = headers_cleaned; headers = headers_cleaned;
console.log('All headers cleaned:', headers); if (log_lvl) {
console.log('All headers cleaned:', headers);
}
console.log('URL params:'); if (log_lvl) {
console.log('URL params:');
}
for (const prop in params) { for (const prop in params) {
if (log_lvl) { if (log_lvl) {
console.log(`${prop}: ${params[prop]}`); console.log(`URL param: ${prop}: ${params[prop]}`);
} }
if (params[prop] === null ) { if (params[prop] === null ) {
params[prop] = 'null'; params[prop] = 'null';

2
src/lib/element_access_type.svelte
View File

@@ -39,7 +39,7 @@ $: if (trigger && $ae_loc.access_type) {
function handle_check_access_type_passcode() { function handle_check_access_type_passcode() {
// console.log('*** handle_check_access_type_passcode() ***'); console.log(`*** handle_check_access_type_passcode() *** passcode list:`, $ae_loc.page_access_code_li);
if (entered_passcode && entered_passcode.length >= 5) { if (entered_passcode && entered_passcode.length >= 5) {
if ($ae_loc.page_access_code_li.administrator == entered_passcode) { if ($ae_loc.page_access_code_li.administrator == entered_passcode) {

3
src/lib/element_data_store.svelte
View File

@@ -64,7 +64,8 @@ let ds_code_obj =
}; };
let ae_ds_loc: Writable<key_val> = localStorageStore(`ae_ds__${ds_code}`, ds_code_obj); let ae_ds_loc: Writable<key_val> = localStorageStore(`ae_ds__${ds_code}`, ds_code_obj);
console.log(`ae_e_data_store cached: ${ds_code} = `, $ae_ds_loc); // console.log(`ae_e_data_store cached: ${ds_code} = `, $ae_ds_loc);
console.log(`ae_e_data_store cached: ${ds_code} account_id=${$ae_loc.account_id}`);
if (!$ae_ds_loc.id) { if (!$ae_ds_loc.id) {
ds_loading_status = '-- loading --'; ds_loading_status = '-- loading --';

37
src/routes/+layout.svelte
View File

@@ -67,11 +67,28 @@ import Element_data_store from '$lib/element_data_store.svelte';
// Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other. This should catch anything that is a child of this layout.svelte file. // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other. This should catch anything that is a child of this layout.svelte file.
$slct.account_id = data.account_id; $slct.account_id = data.account_id;
console.log(`$slct.account_id = `, $slct.account_id); console.log(`$slct.account_id = `, $slct.account_id);
let ae_acct = data.ae_acct[$slct.account_id]; let ae_acct = data[$slct.account_id];
console.log(`ae_acct = `, ae_acct); console.log(`ae_acct = `, ae_acct);
// let ae_acct = data.ae_acct; // let ae_acct = data.ae_acct;
// $ae_loc = ae_acct.loc;
// $ae_api = ae_acct.api; // $ae_api = ae_acct.api;
// $ae_loc = ae_acct.loc;
$ae_api = {
...$ae_api,
...ae_acct.api,
}
console.log(`$ae_api = `, $ae_api);
$ae_loc = {
...$ae_loc,
...ae_acct.loc,
}
console.log(`$ae_loc = `, $ae_loc);
$slct = {
...$slct,
...ae_acct.slct,
}
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_slct.event_id = $ae_loc.site_cfg_json.slct__event_id;
@@ -86,6 +103,14 @@ if ($ae_loc.site_cfg_json.slct__event_id) {
console.log(`No Event ID set.`); console.log(`No Event ID set.`);
} }
if ($ae_loc.site_cfg_json.slct__sponsorship_cfg_id) {
$slct.sponsorship_cfg_id = $ae_loc.site_cfg_json.slct__sponsorship_cfg_id;
} else if ($ae_loc.default__sponsorship_cfg_id) {
$slct.sponsorship_cfg_id = $ae_loc.default__sponsorship_cfg_id;
} else {
console.log(`No Sponsorship Config ID set.`);
}
if (browser) { if (browser) {
// Waiting until the browser exists. // Waiting until the browser exists.
// save_ds_to_local(ae_acct.ds); // save_ds_to_local(ae_acct.ds);
@@ -162,6 +187,10 @@ onMount(() => {
$events_slct.event_id = 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'); $events_loc.event_id = data.url.searchParams.get('event_id');
} }
if (data.url.searchParams.get('sponsorship_cfg_id')) {
$slct.sponsorship_cfg_id = data.url.searchParams.get('sponsorship_cfg_id');
}
}); });
@@ -178,7 +207,7 @@ onMount(() => {
<svelte:head> <svelte:head>
<title>{ae_acct.loc.title ?? 'loading...'}</title> <title>{$ae_loc.title ?? 'Æ loading...'}</title>
<link rel="stylesheet" href="{ae_acct.loc.site_style_href}"> <link rel="stylesheet" href="{ae_acct.loc.site_style_href}">
<!-- <link rel="manifest" href="/manifest.json"> --> <!-- <link rel="manifest" href="/manifest.json"> -->
</svelte:head> </svelte:head>
@@ -232,7 +261,7 @@ onMount(() => {
</svelte:fragment> </svelte:fragment>
<!-- OSIT's Aether App --> <!-- OSIT's Aether App -->
<!-- {@html (browser ? JSON.parse(localStorage.getItem('ae_ds__hub__site__appshell_header')) : 'not found')} --> <!-- {@html (browser ? JSON.parse(localStorage.getItem('ae_ds__hub__site__appshell_header')).html : '-- not found --')} -->
<!-- {@html $ae_sess.site_appshell_header} --> <!-- {@html $ae_sess.site_appshell_header} -->
<Element_data_store <Element_data_store
ds_code="hub__site__appshell_header" ds_code="hub__site__appshell_header"

125
src/routes/+layout.ts
View File

@@ -48,6 +48,9 @@ if (ae_no_account_id) {
ae_api_init['headers'] = ae_api_headers; ae_api_init['headers'] = ae_api_headers;
let ae_loc_init: key_val = {
};
// export const prerender = false; // export const prerender = false;
// There is not an initial data store from SvelteKit for this, so we will just use the API to get the data. // There is not an initial data store from SvelteKit for this, so we will just use the API to get the data.
@@ -79,7 +82,7 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
// let ae_api_tmp = get(ae_api); // let ae_api_tmp = get(ae_api);
// console.log(`ae_api = `, ae_api_tmp); // console.log(`ae_api = `, ae_api_tmp);
let ds_code_li: null|key_val = null; let ds_code_li: null|key_val = {};
// if (ae_loc_tmp && ae_loc_tmp.ds) { // if (ae_loc_tmp && ae_loc_tmp.ds) {
// ds_code_li = ae_loc_tmp.ds; // ds_code_li = ae_loc_tmp.ds;
// } // }
@@ -93,7 +96,7 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
// '_XY7DXtc9MY': ae_acct, // '_XY7DXtc9MY': ae_acct,
}, },
ae_loc: ae_loc_tmp, ae_loc: {},
ae_api: ae_api_init, ae_api: ae_api_init,
ae_ds: {}, ae_ds: {},
ae_hub: {}, // was ae_core ae_hub: {}, // was ae_core
@@ -121,14 +124,7 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
submenu: {}, submenu: {},
}; };
// let loading_results = null;
// First do a site_domain look up to check if it is valid and get the account_id. // First do a site_domain look up to check if it is valid and get the account_id.
if (!url.host) {
console.log(`ERROR: No host found in the URL!!!`);
return false;
}
// ae_loc.url_host = data.url.host; // Use this to look up? sub.example.com:123 // ae_loc.url_host = data.url.host; // Use this to look up? sub.example.com:123
// ae_loc.fqdn = url.host; // Use this to look up? sub.example.com:123 // ae_loc.fqdn = url.host; // Use this to look up? sub.example.com:123
// ae_loc.url_hostname = data.url.hostname; // sub.example.com // ae_loc.url_hostname = data.url.hostname; // sub.example.com
@@ -136,13 +132,7 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
// ae_loc.site_domain = data.url.origin; // ae_loc.site_domain = data.url.origin;
// console.log(`ae_loc = `, ae_loc); // console.log(`ae_loc = `, ae_loc);
// const res = await fetch(`https://api.example.com/data`); account_id = await core_func.handle_load_ae_obj_id__site_domain({api_cfg: ae_api_init, fqdn: url.host, try_cache: false})
ae_api_tmp['account_id'] = null;
ae_api_tmp['headers']['x-account-id'] = '';
ae_api_tmp['headers']['x-no-account-id'] = 'nothing to see here'
account_id = await core_func.handle_load_ae_obj_id__site_domain({api_cfg: ae_api_tmp, fqdn: url.host, try_cache: false})
.then(function (site_domain_results) { .then(function (site_domain_results) {
if (site_domain_results) { if (site_domain_results) {
@@ -152,19 +142,17 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
ae_acct.account_id = site_domain_results.account_id_random; ae_acct.account_id = site_domain_results.account_id_random;
// ae_api_tmp = get(ae_api); ae_api_init['account_id'] = site_domain_results.account_id_random;
ae_api_init['headers']['x-account-id'] = site_domain_results.account_id_random;
ae_api_init['headers']['x-no-account-id'] = null;
ae_api_tmp['account_id'] = site_domain_results.account_id_random; ae_loc_init['account_id'] = site_domain_results.account_id_random;
ae_api_tmp['headers']['x-account-id'] = site_domain_results.account_id_random; ae_loc_init['site_id'] = site_domain_results.site_id_random;
ae_api_tmp['headers']['x-no-account-id'] = null; ae_loc_init['site_domain_id'] = site_domain_results.site_domain_id_random;
ae_loc_init['site_enable'] = site_domain_results.enable;
ae_loc_tmp['account_id'] = site_domain_results.account_id_random; ae_loc_init['site_style_href'] = site_domain_results.style_href;
ae_loc_tmp['site_id'] = site_domain_results.site_id_random; ae_loc_init['site_google_tracking_id'] = site_domain_results.google_tracking_id;
ae_loc_tmp['site_domain_id'] = site_domain_results.site_domain_id_random; ae_loc_init['site_cfg_json'] = site_domain_results.cfg_json;
ae_loc_tmp['site_enable'] = site_domain_results.enable;
ae_loc_tmp['site_style_href'] = site_domain_results.style_href;
ae_loc_tmp['site_google_tracking_id'] = site_domain_results.google_tracking_id;
ae_loc_tmp['site_cfg_json'] = site_domain_results.cfg_json;
console.log(`root layout.ts: Returning account_id = `, site_domain_results.account_id_random); console.log(`root layout.ts: Returning account_id = `, site_domain_results.account_id_random);
@@ -180,52 +168,69 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
// return true; // return true;
// }); // });
console.log(ae_loc_init);
// if (browser) { // if (browser) {
// localStorage.setItem('ae_account_id', await account_id); // localStorage.setItem('ae_account_id', await account_id);
// } // }
// NOTE: We need to wait for the account_id to be returned before we can continue. It is required for the api_cfg. // NOTE: We need to wait for the account_id to be returned before we can continue. It is required for the api_cfg.
let ds_type: null|string = 'json'; let ds_type: null|string = 'json';
ds_code = 'hub__page__access_code_li_json'; ds_code = 'hub__page__access_code_li_json';
if (account_id) { console.log(`INFO: ae_ account_id = `, account_id);
console.log(`INFO: ae_ account_id = `, account_id); // ae_acct['ds'][ds_code]
ds_code_li[ds_code] = core_func.handle_load_ae_obj_code__data_store({api_cfg: ae_api_tmp, code: ds_code, data_type: ds_type}) ds_code_li[ds_code] = await core_func.handle_load_ae_obj_code__data_store({api_cfg: ae_api_init, code: ds_code, data_type: ds_type, save_idb: false})
.then(function (ds_results) { .then(function (ds_results) {
if (ds_results) { if (ds_results) {
// console.log(`ae_ ds_results = `, ds_results); console.log(`ae_ ds_results = `, ds_results);
return ds_results; // if (browser) {
} // console.log(`ae_ds__ key: ${ds_code}, value:`, ds_results);
// localStorage.setItem(`ae_ds__${ds_code}`, JSON.stringify(ds_results));
// } else {
// console.log('No browser!!!');
// }
return ds_results;
} }
);
} else {
console.log(`ERROR: No account_id was returned!!!`);
// return false;
} }
);
// ds_type = 'text'; ae_loc_init['page_access_code_li'] = ds_code_li['hub__page__access_code_li_json'];
// ds_code = 'hub__site__appshell_header';
// ds_code_li[ds_code] = await core_func.handle_load_ae_obj_code__data_store({api_cfg: ae_api_tmp, code: ds_code, data_type: ds_type})
// .then(function (ds_results) {
// if (ds_results) {
// console.log(`ae_ ds_results = `, ds_results);
// return ds_results;
// }
// } ae_acct['api'] = ae_api_init;
// ); ae_acct['loc'] = ae_loc_init;
ae_loc_tmp['page_access_code_li'] = ds_code_li['hub__page__access_code_li_json'];
ae_acct['api'] = ae_api_tmp;
ae_acct['loc'] = ae_loc_tmp;
ae_acct['ds'] = ds_code_li; ae_acct['ds'] = ds_code_li;
ae_acct['slct'] = {
'account_id': account_id,
'site_domain_id': ae_loc_init.site_domain_id,
'site_id': ae_loc_init.site_id,
// For events_leads, events_badges, events_speakers
'event_id': ae_loc_init.site_cfg_json.slct__event_id,
'event_badge_template': ae_loc_init.site_cfg_json.slct__event_badge_template,
// For sponsorships
'sponsorship_cfg_id': ae_loc_init.site_cfg_json.slct__sponsorship_cfg_id,
}
// console.log(`ae_acct = `, ae_acct); // console.log(`ae_acct = `, ae_acct);
data_struct.ae_acct[ae_loc_tmp.account_id] = ae_acct; // WARNING: Precaution against shared data between sites and sessions.
// data_struct.ae_acct = ae_acct; // data_struct.ae_acct[ae_loc_init.account_id] = ae_acct;
data_struct[ae_loc_init.account_id] = ae_acct;
return data_struct; return data_struct;
} }
// ds_type = 'text';
// ds_code = 'hub__site__appshell_header';
// ds_code_li[ds_code] = await core_func.handle_load_ae_obj_code__data_store({api_cfg: ae_api_tmp, code: ds_code, data_type: ds_type})
// .then(function (ds_results) {
// if (ds_results) {
// console.log(`ae_ ds_results = `, ds_results);
// return ds_results;
// }
// }
// );

29
src/routes/events_badges/+layout.svelte
View File

@@ -1,6 +1,7 @@
<script lang="ts"> <script lang="ts">
/** @type {import('./$types').LayoutData} */ /** @type {import('./$types').LayoutData} */
export let data: any; export let data: any;
import { goto } from '$app/navigation'; import { goto } from '$app/navigation';
import type { Writable } from 'svelte/store'; import type { Writable } from 'svelte/store';
import { localStorageStore } from '@skeletonlabs/skeleton'; import { localStorageStore } from '@skeletonlabs/skeleton';
@@ -14,15 +15,25 @@ import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores';
// import Element_data_store from '$lib/element_data_store.svelte'; // import Element_data_store from '$lib/element_data_store.svelte';
$events_loc.qry__enabled = 'enabled';
$events_loc.qry__hidden = 'not_hidden';
$events_loc.qry__limit = 15;
$events_loc.qry__offset = 0;
// let ae_slct_loc: Writable<key_val> = localStorageStore(`ae_slct__event_id`, ds_code_obj); // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other.
// console.log(`ae_ Data Store ${ds_code} = `, $ae_slct_loc); $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);
$events_slct.event_id = ae_acct.slct.event_id
$events_slct.event_obj = ae_acct.slct.event_obj
let ae_promises: key_val = {}; let ae_promises: key_val = {};
if (data.ae_loc.site_cfg_json.slct__event_id) { if (ae_acct.loc.site_cfg_json.slct__event_id) {
$events_slct.event_id = data.ae_loc.site_cfg_json.slct__event_id; $events_slct.event_id = ae_acct.loc.site_cfg_json.slct__event_id;
$events_loc.event_id = data.ae_loc.site_cfg_json.slct__event_id; $events_loc.event_id = ae_acct.loc.site_cfg_json.slct__event_id;
} else if ($events_loc.default__event_id) { } else if ($events_loc.default__event_id) {
$events_slct.event_id = $events_loc.default__event_id; $events_slct.event_id = $events_loc.default__event_id;
$events_loc.event_id = $events_loc.default__event_id; $events_loc.event_id = $events_loc.default__event_id;
@@ -98,7 +109,7 @@ async function handle_load_ae_obj_id__event({event_id, try_cache=false}) {
<svelte:head> <svelte:head>
<title>Events Badges - {data.ae_loc.title}</title> <title>Events Badges - {$events_loc.title ?? 'Æ loading...'}</title>
</svelte:head> </svelte:head>
<!-- <h1>Events Badges Layout?</h1> --> <!-- <h1>Events Badges Layout?</h1> -->
@@ -112,7 +123,7 @@ async function handle_load_ae_obj_id__event({event_id, try_cache=false}) {
<button <button
title={item.title} title={item.title}
class="hover:variant-ghost-secondary" class="hover:variant-ghost-secondary"
class:hidden={(!data.ae_loc.trusted_access && item.access === 'trusted') || (!data.ae_loc.administrator_access && item.access === 'administrator' || item.hide)} class:hidden={(!$ae_loc.trusted_access && item.access === 'trusted') || (!$ae_loc.administrator_access && item.access === 'administrator' || item.hide)}
disabled={item.disable} disabled={item.disable}
on:click={() => { on:click={() => {
@@ -129,7 +140,7 @@ async function handle_load_ae_obj_id__event({event_id, try_cache=false}) {
href={item.href} href={item.href}
title={item.title} title={item.title}
class="hover:variant-ghost-secondary" class="hover:variant-ghost-secondary"
class:hidden={(!data.ae_loc.trusted_access && item.access === 'trusted') || (!data.ae_loc.administrator_access && item.access === 'administrator' || item.hide)} class:hidden={(!$ae_loc.trusted_access && item.access === 'trusted') || (!$ae_loc.administrator_access && item.access === 'administrator' || item.hide)}
class:disabled={item.disable} class:disabled={item.disable}
> >
{item.name} {item.name}
@@ -139,7 +150,7 @@ async function handle_load_ae_obj_id__event({event_id, try_cache=false}) {
<!-- <button <!-- <button
title={item.title} title={item.title}
class="hover:variant-ghost-secondary" class="hover:variant-ghost-secondary"
class:hidden={(!data.ae_loc.trusted_access && item.access === 'trusted') || (!data.ae_loc.administrator_access && item.access === 'administrator' || item.hide)} class:hidden={(!$ae_loc.trusted_access && item.access === 'trusted') || (!$ae_loc.administrator_access && item.access === 'administrator' || item.hide)}
disabled={item.disable} disabled={item.disable}
on:click={() => { on:click={() => {

29
src/routes/events_badges/+layout.ts
View File

@@ -9,21 +9,29 @@
// import type { key_val } from '$lib/ae_stores'; // import type { key_val } from '$lib/ae_stores';
export async function load({ params, parent, url }) { // route export async function load({ parent }) { // route
let data = await parent();
console.log(`ae_events_badges +layout.ts data:`, data);
// console.log(`ae_events_badges +layout.ts data.params:`, params); // console.log(`ae_events_badges +layout.ts data.params:`, params);
// console.log(`ae_events_badges +layout.ts data.route:`, route); // console.log(`ae_events_badges +layout.ts data.route:`, route);
// console.log(`ae_events_badges +layout.ts data.url:`, url); // console.log(`ae_events_badges +layout.ts data.url:`, url);
// const { ae_init, root_layout_ts } = await parent(); let account_id = data.account_id;
let data = await parent(); let ae_acct = data[account_id];
console.log(`ae_events_badges +layout.ts data:`, data); console.log(`ae_acct = `, ae_acct);
if (data.ae_loc.account_id) { if (!account_id) {
console.log(`ae_events_badges +layout.ts data = data.ae_loc:`, data.ae_loc); console.log(`events_badges +layout.ts: The account_id was not found in the data!!!`);
} else { return false;
console.log(`ae_events_badges +layout.ts data = data.ae_loc:`, data.ae_loc);
} }
let event_id = ae_acct.slct.event_id;
if (!event_id) {
console.log(`events_badges +layout.ts: The event_id was not found in the data!!!`);
return false;
}
data.ae_events_badges_layout_ts = true; data.ae_events_badges_layout_ts = true;
@@ -38,8 +46,11 @@ export async function load({ params, parent, url }) { // route
}; };
data.submenu = submenu data.submenu = submenu
// WARNING: Precaution against shared data between sites and sessions.
data[account_id] = ae_acct;
return data; return data;
} }
// export const prerender = false; // export const prerender = false;
// export const prerender = true; // export const prerender = true;

39
src/routes/events_leads/+layout.svelte
View File

@@ -9,34 +9,37 @@ 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 { ae_util } from '$lib/ae_utils'; import { ae_util } from '$lib/ae_utils';
if (!$ae_api.account_id || !$ae_api.headers['x-account-id']) { // if (!$ae_api.account_id || !$ae_api.headers['x-account-id']) {
console.log(`Account ID not set. Redirecting to root if can not fix.`); // console.log(`Account ID not set. Redirecting to root if can not fix.`);
if ($ae_loc.account_id) { // if ($ae_loc.account_id) {
$ae_api.account_id = $ae_loc.account_id; // $ae_api.account_id = $ae_loc.account_id;
$ae_api.headers['x-account-id'] = $ae_loc.account_id; // $ae_api.headers['x-account-id'] = $ae_loc.account_id;
} else { // } else {
console.log(`Account ID not set!!!`); // console.log(`Account ID not set!!!`);
} // }
} // }
$events_loc.qry__enabled = 'enabled'; $events_loc.qry__enabled = 'enabled';
$events_loc.qry__hidden = 'not_hidden'; $events_loc.qry__hidden = 'not_hidden';
$events_loc.qry__limit = 25; $events_loc.qry__limit = 25;
$events_loc.qry__offset = 0; $events_loc.qry__offset = 0;
// Quickly save the data passed from the parent to the Svelte stores. // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other.
$events_slct.event_id = data.ae_slct.event_id $slct.account_id = data.account_id;
$events_slct.event_obj = data.ae_slct.event_obj console.log(`$slct.account_id = `, $slct.account_id);
$events_slct.exhibit_obj_li = data.ae_slct.event_exhibit_obj_li let ae_acct = data[$slct.account_id];
console.log(`ae_acct = `, ae_acct);
$events_slct.event_id = ae_acct.slct.event_id
$events_slct.event_obj = ae_acct.slct.event_obj
$events_slct.exhibit_obj_li = ae_acct.slct.event_exhibit_obj_li
onMount(() => { onMount(() => {
console.log('Events Leads: +layout.svelte'); console.log('Events Leads: +layout.svelte');
// console.log('ae_ slct:', $slct); // let href_url = window.location.href;
// console.log(window.location.href);
let href_url = window.location.href;
// $ae_loc.href_url = href_url; // $ae_loc.href_url = href_url;
// console.log(`$ae_loc.href_url = `, $ae_loc.href_url); // console.log(`$ae_loc.href_url = `, $ae_loc.href_url);
@@ -52,7 +55,7 @@ onMount(() => {
<svelte:head> <svelte:head>
<title>Events Leads - {data.ae_loc.title}</title> <title>Events Leads - {$events_loc.title}</title>
</svelte:head> </svelte:head>

37
src/routes/events_leads/+layout.ts
View File

@@ -3,37 +3,40 @@ console.log(`ae_events_leads +layout.ts start`);
import { events_func } from '$lib/ae_events_functions'; import { events_func } from '$lib/ae_events_functions';
export async function load({ parent }) { export async function load({ parent }) {
let data = await parent(); let data = await parent();
if (data.ae_loc.account_id) { let account_id = data.account_id;
} else { let ae_acct = data[account_id];
console.log(`The account_id was not found in the data.ae_loc!!!`); console.log(`ae_acct = `, ae_acct);
if (!account_id) {
console.log(`events_leads +layout.ts: The account_id was not found in the data!!!`);
return false; return false;
} }
let event_id = null; let event_id = ae_acct.slct.event_id;
if (data.ae_loc.site_cfg_json.slct__event_id) { if (!event_id) {
event_id = data.ae_loc.site_cfg_json.slct__event_id; console.log(`events_leads +layout.ts: The event_id was not found in the data!!!`);
} 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; 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}); let load_event_obj = events_func.handle_load_ae_obj_id__event({api_cfg: ae_acct.api, event_id: event_id, try_cache: false});
data.ae_slct.event_id = event_id; ae_acct.slct.event_obj = load_event_obj;
data.ae_slct.event_obj = await load_event_obj;
let load_event_exhibit_obj_li = events_func.handle_load_ae_obj_li__exhibit({api_cfg: data.ae_api, event_id: event_id, try_cache: false}); let load_event_exhibit_obj_li = events_func.handle_load_ae_obj_li__exhibit({api_cfg: ae_acct.api, event_id: event_id, try_cache: false});
console.log(`load_event_exhibit_obj_li = `, load_event_exhibit_obj_li); console.log(`load_event_exhibit_obj_li = `, load_event_exhibit_obj_li);
data.ae_slct.event_exhibit_obj_li = load_event_exhibit_obj_li;
ae_acct.slct.event_exhibit_obj_li = load_event_exhibit_obj_li;
// WARNING: Precaution against shared data between sites and sessions.
data[account_id] = ae_acct;
return data; return data;
} }
// export const prerender = true; // export const prerender = false;
// export const prerender = true;

41
src/routes/events_leads/+page.svelte
View File

@@ -1,5 +1,5 @@
<script lang="ts"> <script lang="ts">
export let data: any; // export let data: any;
// console.log(`ae_events_leads +page data:`, data); // console.log(`ae_events_leads +page data:`, data);
// console.log(`ae_events_leads Data Params:`, data.url.searchParams.get('event_id')); // console.log(`ae_events_leads Data Params:`, data.url.searchParams.get('event_id'));
@@ -33,24 +33,12 @@ let event_exhibit_obj_li = liveQuery(
$events_slct.exhibit_id = null; $events_slct.exhibit_id = null;
$events_slct.exhibit_obj = null; $events_slct.exhibit_obj = null;
// This should probably be moved
// 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.`);
// }
// export let event_exhibit_staff_passcode: string = ''; // export let event_exhibit_staff_passcode: string = '';
let disable_open_lead_retrieval_btn: boolean = true; let disable_open_lead_retrieval_btn: boolean = true;
let disable_reset_passcode_btn: boolean = true; let disable_reset_passcode_btn: boolean = true;
let reset_passcode: string = ''; let reset_passcode: string = '';
onMount(() => { onMount(() => {
console.log('Events Leads: +page.svelte'); console.log('Events Leads: +page.svelte');
@@ -140,6 +128,31 @@ function handle_check_event_exhibit_staff_passcode(entered_passcode: string) {
} }
} }
function handle_update_event_exhibit_staff_passcode(exhibit_id, reset_passcode) {
console.log(`*** handle_update_event_exhibit_staff_passcode() *** $events_slct.exhibit_id= ${exhibit_id} new passcode: ${reset_passcode}`);
// if ($events_slct.exhibit_obj && reset_passcode && reset_passcode.length >= 4) {
// $events_slct.exhibit_obj.staff_passcode = reset_passcode;
// $events_sess.leads.entered_passcode = reset_passcode;
// db_events.exhibits.update($events_slct.exhibit_obj.id_random, { staff_passcode: reset_passcode })
// .then(function (updated) {
// console.log(`Updated passcode for exhibit ${$events_slct.exhibit_obj.id_random} or ${$events_slct.exhibit_id}`);
// disable_open_lead_retrieval_btn = false;
// disable_reset_passcode_btn = false;
// })
// .catch(function (error) {
// console.log('Failed to update passcode.', error);
// disable_open_lead_retrieval_btn = true;
// disable_reset_passcode_btn = true;
// });
// } else {
// console.log('Missing selected event exhibit and or staff passcode.');
// disable_open_lead_retrieval_btn = true;
// disable_reset_passcode_btn = true;
// }
}
</script> </script>

2
src/routes/events_leads/+page.ts
View File

@@ -8,7 +8,7 @@ export async function load({ params, parent, url }) { // route
// console.log(`ae_events_leads +page.ts data.route:`, route); // console.log(`ae_events_leads +page.ts data.route:`, route);
// console.log(`ae_events_leads +page.ts data.url:`, url); // console.log(`ae_events_leads +page.ts data.url:`, url);
let data = await parent(); let data = parent();
// console.log(`ae_events_leads +page.ts data:`, data); // console.log(`ae_events_leads +page.ts data:`, data);
// console.log(`ae_events_leads +page.ts data.ae_loc:`, data.ae_loc); // console.log(`ae_events_leads +page.ts data.ae_loc:`, data.ae_loc);

18
src/routes/events_leads/exhibit/[slug]/+page.svelte
View File

@@ -1,5 +1,6 @@
<script lang="ts"> <script lang="ts">
export let data; /** @type {import('./$types').PageData} */
export let data: any;
// console.log(`ae_events_leads exhibit [slug] +page.svelte data:`, data); // console.log(`ae_events_leads exhibit [slug] +page.svelte data:`, data);
import { onMount } from 'svelte'; import { onMount } from 'svelte';
@@ -16,11 +17,15 @@ import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_st
import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores';
import { events_func } from '$lib/ae_events_functions'; import { events_func } from '$lib/ae_events_functions';
// Quickly save the data passed from the parent to the Svelte stores. // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other.
$events_slct.exhibit_id = data.ae_slct.event_exhibit_id; $slct.account_id = data.account_id;
$events_slct.exhibit_obj = data.ae_slct.event_exhibit_obj; console.log(`$slct.account_id = `, $slct.account_id);
$events_slct.exhibit_tracking_obj_li = data.ae_slct.event_exhibit_tracking_obj_li; let ae_acct = data[$slct.account_id];
console.log(`ae_acct = `, ae_acct);
$events_slct.exhibit_id = ae_acct.slct.event_exhibit_id;
$events_slct.exhibit_obj = ae_acct.slct.event_exhibit_obj;
$events_slct.exhibit_tracking_obj_li = ae_acct.slct.event_exhibit_tracking_obj_li;
import Leads_add_scan from './leads_add_scan.svelte'; import Leads_add_scan from './leads_add_scan.svelte';
import Leads_list from './leads_list.svelte'; import Leads_list from './leads_list.svelte';
@@ -29,7 +34,6 @@ import Leads_payment from './leads_payment.svelte';
// let param_slug_event_exhibit_id = data.params.slug; // let param_slug_event_exhibit_id = data.params.slug;
let event_exhibit_obj = liveQuery( let event_exhibit_obj = liveQuery(
() => db_events.exhibits.get($events_slct.exhibit_id) () => db_events.exhibits.get($events_slct.exhibit_id)
// () => db_events.exhibits.get(param_slug_event_exhibit_id) // () => db_events.exhibits.get(param_slug_event_exhibit_id)
@@ -168,7 +172,7 @@ $: if ($events_trigger == 'load__event_exhibit_obj' && $events_slct.exhibit_id)
// handle_load_ae_obj_id__event({event_exhibit_id: $events_slct.exhibit_id, try_cache: false}); // handle_load_ae_obj_id__event({event_exhibit_id: $events_slct.exhibit_id, try_cache: false});
let load_event_exhibit_obj = events_func.handle_load_ae_obj_id__exhibit({api_cfg: data.ae_api, exhibit_id: $events_slct.exhibit_id, try_cache: false}) let load_event_exhibit_obj = events_func.handle_load_ae_obj_id__exhibit({api_cfg: ae_acct.api, exhibit_id: $events_slct.exhibit_id, try_cache: false})
.then(function (result) { .then(function (result) {
console.log(`load_event_exhibit_obj = `, result); console.log(`load_event_exhibit_obj = `, result);

40
src/routes/events_leads/exhibit/[slug]/+page.ts
View File

@@ -1,9 +1,9 @@
/** @type {import('./$types').PageLoad} */ /** @type {import('./$types').PageLoad} */
console.log(`ae_events_leads slug +page.ts start`); console.log(`ae_events_leads [slug] +page.ts start`);
import { events_func } from '$lib/ae_events_functions'; import { events_func } from '$lib/ae_events_functions';
export async function load({ params, parent, url }) { // route export async function load({ parent }) { // route
// console.log(`ae_events_leads +page.ts data.params:`, params); // console.log(`ae_events_leads +page.ts data.params:`, params);
// console.log(`ae_events_leads +page.ts data.route:`, route); // console.log(`ae_events_leads +page.ts data.route:`, route);
// console.log(`ae_events_leads +page.ts data.url:`, url); // console.log(`ae_events_leads +page.ts data.url:`, url);
@@ -11,28 +11,38 @@ export async function load({ params, parent, url }) { // route
let data = await parent(); let data = await parent();
// console.log(`ae_events_leads +page.ts data:`, data); // console.log(`ae_events_leads +page.ts data:`, data);
data.ae_events_leads_exhibit_slug_page_ts = true; let account_id = data.account_id;
let ae_acct = data[account_id];
console.log(`ae_acct = `, ae_acct);
let param_slug_event_exhibit_id = data.params.slug; if (!account_id) {
console.log(`events_leads exhibit [slug] +page.ts: The account_id was not found in the data!!!`);
let event_exhibit_id = null;
if (param_slug_event_exhibit_id) {
event_exhibit_id = param_slug_event_exhibit_id;
} else {
console.log(`The slct__event_exhibit_id was not found in the data.params.slug or data.url!!!`);
return false; return false;
} }
data.ae_slct.event_exhibit_id = event_exhibit_id; data.ae_events_leads_exhibit_slug_page_ts = true;
let load_event_exhibit_obj = events_func.handle_load_ae_obj_id__exhibit({api_cfg: data.ae_api, exhibit_id: event_exhibit_id, try_cache: false}); // let param_slug_event_exhibit_id = data.params.slug;
data.ae_slct.event_exhibit_obj = await load_event_exhibit_obj; let event_exhibit_id = data.params.slug;
if (!event_exhibit_id) {
console.log(`events_leads [slug] +layout.ts: The event_exhibit_id was not found in the data.params.slug!!!`);
return false;
}
let load_event_exhibit_tracking_obj_li = events_func.handle_load_ae_obj_li__exhibit_tracking({api_cfg: data.ae_api, exhibit_id: event_exhibit_id, try_cache: false}); ae_acct.slct.event_exhibit_id = event_exhibit_id;
let load_event_exhibit_obj = events_func.handle_load_ae_obj_id__exhibit({api_cfg: ae_acct.api, exhibit_id: event_exhibit_id, try_cache: false});
ae_acct.slct.event_exhibit_obj = await load_event_exhibit_obj;
let load_event_exhibit_tracking_obj_li = events_func.handle_load_ae_obj_li__exhibit_tracking({api_cfg: ae_acct.api, exhibit_id: event_exhibit_id, try_cache: false});
console.log(`load_event_exhibit_tracking_obj_li = `, load_event_exhibit_tracking_obj_li); console.log(`load_event_exhibit_tracking_obj_li = `, load_event_exhibit_tracking_obj_li);
data.ae_slct.event_exhibit_tracking_obj_li = load_event_exhibit_tracking_obj_li; ae_acct.slct.event_exhibit_tracking_obj_li = load_event_exhibit_tracking_obj_li;
// WARNING: Precaution against shared data between sites and sessions.
data[account_id] = ae_acct;
return data; return data;
} }

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

@@ -6,10 +6,17 @@ import { onMount } from 'svelte';
import { localStorageStore } from '@skeletonlabs/skeleton'; import { localStorageStore } from '@skeletonlabs/skeleton';
import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; 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. // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other.
$ae_loc = data.ae_loc; // $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_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 // We want to loop through all of the data store (ds) key value pairs and set them to localStorage
if (data.ae_ds) { if (data.ae_ds) {
@@ -20,6 +27,7 @@ if (data.ae_ds) {
} }
onMount(() => { onMount(() => {
console.log(`$slct.event_id = `, $slct.event_id);
if (data.url.searchParams.get('event_id')) { if (data.url.searchParams.get('event_id')) {
$slct.event_id = 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'); $ae_loc.mod.events.event_id = data.url.searchParams.get('event_id');
@@ -30,7 +38,7 @@ onMount(() => {
<svelte:head> <svelte:head>
<title>Speaker Hub - {data.ae_loc.title}</title> <title>Speaker Hub - {$ae_loc.title ?? 'Æ loading...'}</title>
</svelte:head> </svelte:head>

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

@@ -1,68 +1,41 @@
/** @type {import('./$types').LayoutLoad} */ /** @type {import('./$types').LayoutLoad} */
console.log(`ae_events_speakers +layout.ts start`); 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 { api } from '$lib/api';
import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; // 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_loc, events_slct, events_trigger } from '$lib/ae_events_stores';
import { events_func } from '$lib/ae_events_functions'; 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 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; 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; let ds_code_li = {}; //: key_val; // = ae_loc_tmp.ds;
// console.log(`ae_ ds_code_li = `, ds_code_li); // console.log(`ae_ ds_code_li = `, ds_code_li);
let ds_code: string = ''; 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_code = 'hub__page__events_speakers__create_info_header';
ds_type = 'text'; ds_type = 'text';
ds_code_li[ds_code] = await api.get_data_store_obj_w_code({ // ds_code_li[ds_code]
api_cfg: get(ae_api), 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})
data_store_code: ds_code, .then(function (ds_results) {
data_type: ds_type,
log_lvl: 1
})
.then( function (ds_results) {
console.log(`ae_ Data Store ${ds_code} = `, ds_results);
if (ds_results) { if (ds_results) {
console.log(`ae_ Data Store ${ds_code} = `, ds_results); // console.log(`ae_ ds_results = `, ds_results);
if (ds_type == 'json') { return ds_results;
return ds_results.json;
} else {
return ds_results.text;
}
} }
}) }
.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_code = 'hub__page__events_speakers__create_info';
ds_type = 'text'; ds_type = 'text';
ds_code_li[ds_code] = await api.get_data_store_obj_w_code({ // ds_code_li[ds_code]
api_cfg: get(ae_api), 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})
data_store_code: ds_code, .then(function (ds_results) {
data_type: ds_type,
log_lvl: 1
})
.then( function (ds_results) {
console.log(`ae_ Data Store ${ds_code} = `, ds_results);
if (ds_results) { if (ds_results) {
console.log(`ae_ Data Store ${ds_code} = `, ds_results); // console.log(`ae_ ds_results = `, ds_results);
if (ds_type == 'json') { return ds_results;
return ds_results.json;
} else {
return ds_results.text;
}
} }
}) }
.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; // let ae_ds_tmp = ae_loc_tmp.ds;
// // Merge the new data into the existing data // // 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); // // console.log(`ae_loc = `, ae_loc_tmp);
// data['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; 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;
} }
// export const prerender = true;
// 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;

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

@@ -1,5 +1,6 @@
<script lang="ts"> <script lang="ts">
export let data; export let data: any;
console.log(`ae_ Svelte Events Speakers +page data:`, data); console.log(`ae_ Svelte Events Speakers +page data:`, data);
import { onMount } from 'svelte'; 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 = route:`, route);
// console.log(`Svelte Events Speakers layout.ts data = url:`, url); // 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); // console.log(`ae_loc = `, ae_loc_tmp);
let ds_code_li: null|key_val = ae_loc_tmp.ds; 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 = { let data_struct = {
ae_init: ae_loc_tmp, // ae_init: ae_loc_tmp,
params: params, params: params,
sections: [ sections: [
{ slug: 'new', title: 'New Event Presenter' }, { slug: 'new', title: 'New Event Presenter' },

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

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

29
src/routes/sponsorships/+layout.svelte
View File

@@ -6,9 +6,14 @@ import { onMount } from 'svelte';
import { localStorageStore } from '@skeletonlabs/skeleton'; import { localStorageStore } from '@skeletonlabs/skeleton';
import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; 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. // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other.
$ae_loc = data.ae_loc; // $slct.account_id = data.account_id;
$ae_loc.mod.sponsorships.cfg_id = data.ae_slct.sponsorship_cfg_id; console.log(`$slct.account_id = `, $slct.account_id);
let ae_acct = data[$slct.account_id];
console.log(`ae_acct = `, ae_acct);
// $ae_loc = ae_acct.loc;
$ae_loc.mod.sponsorships.cfg_id = ae_acct.slct.sponsorship_cfg_id;
$ae_loc.mod.sponsorships.level_guest_max_li = { $ae_loc.mod.sponsorships.level_guest_max_li = {
0: 0, 0: 0,
1: 4, // CHOW 2024 - Friend 1: 4, // CHOW 2024 - Friend
@@ -19,16 +24,16 @@ $ae_loc.mod.sponsorships.level_guest_max_li = {
6: 16, // CHOW 2024 - Signature Partner 6: 16, // CHOW 2024 - Signature Partner
7: 16, // CHOW 2024 - Premier Partner 7: 16, // CHOW 2024 - Premier Partner
}; };
$slct.sponsorship_cfg_id = data.ae_slct.sponsorship_cfg_id; // $slct.sponsorship_cfg_id = ae_acct.slct.sponsorship_cfg_id;
$slct.sponsorship_cfg_obj = data.ae_slct.sponsorship_cfg_obj; // $slct.sponsorship_cfg_obj = ae_acct.slct.sponsorship_cfg_obj;
// We want to loop through all of the data store (ds) key value pairs and set them to localStorage // We want to loop through all of the data store (ds) key value pairs and set them to localStorage
if (data.ae_ds) { // if (ae_acct.ds) {
for (let [key, value] of Object.entries(data.ae_ds)) { // for (let [key, value] of Object.entries(ae_acct.ds)) {
console.log(`ae_ds__ key: ${key}, value:`, value); // console.log(`ae_ds__ key: ${key}, value:`, value);
localStorageStore(`ae_ds__${key}`, value); // localStorageStore(`ae_ds__${key}`, value);
} // }
} // }
onMount(() => { onMount(() => {
@@ -41,7 +46,7 @@ onMount(() => {
<svelte:head> <svelte:head>
<title>Sponsor Hub - {data.ae_loc.title}</title> <title>Sponsor Hub - {$ae_loc.title}</title>
</svelte:head> </svelte:head>
<!-- <h1>Sponsorships Layout?</h1> --> <!-- <h1>Sponsorships Layout?</h1> -->

250
src/routes/sponsorships/+layout.ts
View File

@@ -1,60 +1,49 @@
/** @type {import('./$types').LayoutLoad} */ /** @type {import('./$types').LayoutLoad} */
console.log(`ae_sponsorships +layout.ts start`); console.log(`ae_sponsorships +layout.ts start`);
import { get } from 'svelte/store'; // import { get } from 'svelte/store';
// import { browser } from '$app/environment';
import { api } from '$lib/api'; // import type { key_val } from '$lib/ae_stores';
import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; // import { api } from '$lib/api';
import type { key_val } from '$lib/ae_stores'; // import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
import { core_func } from '$lib/ae_core_functions';
import { spons_func } from '$lib/ae_sponsorships_functions'; import { spons_func } from '$lib/ae_sponsorships_functions';
export async function load({ params, parent, url }) { // route export async function load({ parent }) {
let data = await 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(`sponsorships +layout.ts: The account_id was not found in the data!!!`);
return false;
}
let sponsorship_cfg_id = ae_acct.slct.sponsorship_cfg_id;
if (!sponsorship_cfg_id) {
console.log(`sponsorships +layout.ts: The sponsorship_cfg_id was not found in the data!!!`);
return false;
}
let load_sponsorship_cfg_obj = spons_func.handle_load_ae_obj_id__sponsorship_cfg({api_cfg: ae_acct.api, sponsorship_cfg_id: sponsorship_cfg_id, try_cache: false});
ae_acct.slct.sponsorship_cfg_id = sponsorship_cfg_id;
ae_acct.slct.sponsorship_cfg_obj = await load_sponsorship_cfg_obj;
data.ae_sponsorships_layout_ts = true; 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; let ds_code_li = {}; //: key_val; // = ae_loc_tmp.ds;
// console.log(`ae_ ds_code_li = `, ds_code_li); // console.log(`ae_ ds_code_li = `, ds_code_li);
let ds_code: string = ''; let ds_code: string = '';
let ds_type: null|string = null; let ds_type: null|string = null;
// let data_struct = {
// 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 = 'sponsorships__agree_li'; // ds_code = 'sponsorships__agree_li';
// ds_type = 'json'; // ds_type = 'json';
@@ -62,89 +51,121 @@ export async function load({ params, parent, url }) { // route
ds_code = 'hub__page__sponsorships__create_info_header'; ds_code = 'hub__page__sponsorships__create_info_header';
ds_type = 'text'; ds_type = 'text';
ds_code_li[ds_code] = await api.get_data_store_obj_w_code({ ds_code_li[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})
api_cfg: data.ae_api, .then(function (ds_results) {
data_store_code: ds_code,
data_type: ds_type,
log_lvl: 2
})
.then( function (ds_results) {
console.log(`ae_ Data Store ${ds_code} = `, ds_results);
if (ds_results) { if (ds_results) {
console.log(`ae_ Data Store ${ds_code} = `, ds_results); // console.log(`ae_ ds_results = `, ds_results);
// let ae_loc_tmp = get(ae_loc); // if (browser) {
if (ds_type == 'json') { // console.log(`ae_ds__ key: ${ds_code}, value:`, ds_results);
// ds_code_li[ds_code] = ds_results.json; // localStorage.setItem(`ae_ds__${ds_code}`, JSON.stringify(ds_results));
// data.ae_ds[ds_code] = ds_results.json; // } else {
return ds_results.json; // console.log('No browser!!!');
} else { // }
// ds_code_li[ds_code] = ds_results.text;
// data.ae_ds[ds_code] = ds_results.text;
return ds_results.text;
}
// ae_loc.set(ae_loc_tmp); return ds_results;
// console.log(`ae_loc = `, get(ae_loc));
} }
}) }
.finally(function (ds_code_val) { );
console.log(`ae_ ds_code_val = `, ds_code_val);
// ae_loc_tmp = {
// ...ae_loc_tmp,
// 'ds': ds_code_li,
// }
// console.log(`ae_loc_tmp = `, ae_loc_tmp);
// ae_loc.set(ae_loc_tmp); // ds_code_li[ds_code] = await api.get_data_store_obj_w_code({
// console.log(`ae_loc = `, get(ae_loc)); // api_cfg: ae_acct.api,
// data_store_code: ds_code,
// data_type: ds_type,
// log_lvl: 2
// })
// .then( function (ds_results) {
// console.log(`ae_ Data Store ${ds_code} = `, ds_results);
// if (ds_results) {
// console.log(`ae_ Data Store ${ds_code} = `, ds_results);
// // let ae_loc_tmp = get(ae_loc);
// if (ds_type == 'json') {
// // ds_code_li[ds_code] = ds_results.json;
// // ae_acct.ds[ds_code] = ds_results.json;
// return ds_results.json;
// } else {
// // ds_code_li[ds_code] = ds_results.text;
// // ae_acct.ds[ds_code] = ds_results.text;
// return ds_results.text;
// }
// return true; // // ae_loc.set(ae_loc_tmp);
return ds_code_val; // // console.log(`ae_loc = `, get(ae_loc));
}); // }
// })
// .finally(function (ds_code_val) {
// console.log(`ae_ ds_code_val = `, ds_code_val);
// // 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 true;
// return ds_code_val;
// });
ds_code = 'hub__page__sponsorships__create_info'; ds_code = 'hub__page__sponsorships__create_info';
ds_type = 'text'; ds_type = 'text';
ds_code_li[ds_code] = await api.get_data_store_obj_w_code({ ds_code_li[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})
api_cfg: data.ae_api, .then(function (ds_results) {
data_store_code: ds_code,
data_type: ds_type,
log_lvl: 2
})
.then( function (ds_results) {
console.log(`ae_ Data Store ${ds_code} = `, ds_results);
if (ds_results) { if (ds_results) {
console.log(`ae_ Data Store ${ds_code} = `, ds_results); // console.log(`ae_ ds_results = `, ds_results);
// let ae_loc_tmp = get(ae_loc); // if (browser) {
if (ds_type == 'json') { // console.log(`ae_ds__ key: ${ds_code}, value:`, ds_results);
// ds_code_li[ds_code] = ds_results.json; // localStorage.setItem(`ae_ds__${ds_code}`, JSON.stringify(ds_results));
// data.ae_ds[ds_code] = ds_results.json; // } else {
return ds_results.json; // console.log('No browser!!!');
} else { // }
// ds_code_li[ds_code] = ds_results.text;
// data.ae_ds[ds_code] = ds_results.text;
return ds_results.text;
}
// ae_loc.set(ae_loc_tmp); return ds_results;
// console.log(`ae_loc = `, get(ae_loc));
} }
}) }
.finally(function (ds_code_val) { );
console.log(`ae_ ds_code_val = `, ds_code_val);
// ae_loc_tmp = {
// ...ae_loc_tmp,
// 'ds': ds_code_li,
// }
// console.log(`ae_loc_tmp = `, ae_loc_tmp);
// ae_loc.set(ae_loc_tmp); // ds_code_li[ds_code] = await api.get_data_store_obj_w_code({
// console.log(`ae_loc = `, get(ae_loc)); // api_cfg: ae_acct.api,
// data_store_code: ds_code,
// data_type: ds_type,
// log_lvl: 2
// })
// .then( function (ds_results) {
// console.log(`ae_ Data Store ${ds_code} = `, ds_results);
// if (ds_results) {
// console.log(`ae_ Data Store ${ds_code} = `, ds_results);
// // let ae_loc_tmp = get(ae_loc);
// if (ds_type == 'json') {
// // ds_code_li[ds_code] = ds_results.json;
// // ae_acct.ds[ds_code] = ds_results.json;
// return ds_results.json;
// } else {
// // ds_code_li[ds_code] = ds_results.text;
// // ae_acct.ds[ds_code] = ds_results.text;
// return ds_results.text;
// }
// return true; // // ae_loc.set(ae_loc_tmp);
return ds_code_val; // // console.log(`ae_loc = `, get(ae_loc));
}); // }
console.log(`ae_ ds_code_li = `, ds_code_li); // })
// .finally(function (ds_code_val) {
// console.log(`ae_ ds_code_val = `, ds_code_val);
// // 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 true;
// return ds_code_val;
// });
// console.log(`ae_ ds_code_li = `, ds_code_li);
// let ae_loc_tmp = get(ae_loc); // let ae_loc_tmp = get(ae_loc);
// console.log(`ae_loc = `, ae_loc_tmp); // console.log(`ae_loc = `, ae_loc_tmp);
@@ -168,9 +189,18 @@ export async function load({ params, parent, url }) { // route
data['ae_ds'] = ds_code_li; data['ae_ds'] = ds_code_li;
// return data_struct; ae_acct['ds'] = {
...ae_acct['ds'],
...ds_code_li
};
// ae_acct['ds'] = ds_code_li;
// WARNING: Precaution against shared data between sites and sessions.
data[account_id] = ae_acct;
return data; return data;
} }
// export const prerender = false; // export const prerender = false;
// export const prerender = true; // export const prerender = true;