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

General clean up. Less debug. Things work better?

Browse Source
This commit is contained in:
Scott Idem
2024-03-29 12:15:50 -04:00
parent c0e1d666f4
commit 0e26765312
10 changed files with 181 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/routes/+layout.svelte
View File

@@ -66,9 +66,9 @@ 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.
$slct.account_id = data.account_id;
console.log(`$slct.account_id = `, $slct.account_id);
console.log(`*ae_root +layout.svelte* $slct.account_id = `, $slct.account_id);
let ae_acct = data[$slct.account_id];
console.log(`ae_acct = `, ae_acct);
// console.log(`*ae_root +layout.svelte* ae_acct = `, ae_acct);
// let ae_acct = data.ae_acct;
// $ae_api = ae_acct.api;
// $ae_loc = ae_acct.loc;
@@ -77,13 +77,13 @@ $ae_api = {
...$ae_api,
...ae_acct.api,
}
console.log(`$ae_api = `, $ae_api);
// console.log(`$ae_api = `, $ae_api);
$ae_loc = {
...$ae_loc,
...ae_acct.loc,
}
console.log(`$ae_loc = `, $ae_loc);
// console.log(`$ae_loc = `, $ae_loc);
$slct = {
...$slct,
@@ -105,8 +105,10 @@ if ($ae_loc.site_cfg_json.slct__event_id) {
if ($ae_loc.site_cfg_json.slct__sponsorship_cfg_id) {
$slct.sponsorship_cfg_id = $ae_loc.site_cfg_json.slct__sponsorship_cfg_id;
$ae_loc.mod.sponsorships.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;
$ae_loc.mod.sponsorships.cfg_id = $ae_loc.default__sponsorship_cfg_id;
} else {
console.log(`No Sponsorship Config ID set.`);
}
@@ -190,19 +192,9 @@ onMount(() => {
if (data.url.searchParams.get('sponsorship_cfg_id')) {
$slct.sponsorship_cfg_id = data.url.searchParams.get('sponsorship_cfg_id');
$ae_loc.mod.sponsorships.cfg_id = data.url.searchParams.get('sponsorship_cfg_id');
}
});
// $slct_trigger = 'set_access_code_li';
// $: if ($slct_trigger == 'set_access_code_li' && !$ae_loc.ds['hub__page__access_code_li_json']) {
// console.log(`$ae_loc.ds['hub__page__access_code_li_json'] = `, $ae_loc.ds['hub__page__access_code_li_json']);
// $slct_trigger = null; // Reset the trigger to prevent loops
// $ae_loc.page_access_code_li = $ae_loc.ds['hub__page__access_code_li_json'];
// $ae_loc = $ae_loc; // Trigger Svelte just in case
// // console.log($ae_loc);
// }
</script>

15
src/routes/+layout.ts
View File

@@ -132,7 +132,7 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
// ae_loc.site_domain = data.url.origin;
// console.log(`ae_loc = `, ae_loc);
account_id = await core_func.handle_load_ae_obj_id__site_domain({api_cfg: ae_api_init, fqdn: url.host, try_cache: false})
account_id = await core_func.handle_load_ae_obj_id__site_domain({api_cfg: ae_api_init, fqdn: url.host, try_cache: false, log_lvl: 1})
.then(function (site_domain_results) {
if (site_domain_results) {
@@ -162,18 +162,11 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
return null;
});
// .then(async function (results) {
// return true;
// })
// .finally(function () {
// return true;
// });
if (!account_id) {
console.log(`root layout.ts: The account_id was not found in API response!!!`);
return false;
}
// console.log(ae_loc_init);
// if (browser) {
@@ -189,12 +182,6 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
.then(function (ds_results) {
if (ds_results) {
console.log(`ae_ ds_results = `, 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;
}

27
src/routes/events_leads/exhibit/[slug]/leads_manage.svelte
View File

@@ -386,6 +386,13 @@ export let get_event_exhibit_tracking_export = async function get_event_exhibit_
{/if} <!-- $events_loc?.leads.auth_exhibit_kv[$events_slct.exhibit_id].key -->
<hr class="border w-full">
<h2 class="h3">
<!-- <span class="fas fa-cogs"></span> -->
Additional Settings
</h2>
<div>
<button
class="btn btn-sm variant-ghost-warning"
@@ -413,15 +420,21 @@ export let get_event_exhibit_tracking_export = async function get_event_exhibit_
<span class="fas fa-eraser mx-1"></span>
Clear Storage
</button>
<button
class="btn btn-sm variant-ghost-warning"
title="Clear browser iDB storage"
on:click={() => {
db_events.delete().then(() => {
console.log('Database cleared.');
});
}}
>
<span class="fas fa-database mx-1"></span>
Clear iDB
</button>
</div>
<hr class="border w-full">
<h2 class="h3">
<!-- <span class="fas fa-cogs"></span> -->
Additional Settings
</h2>
{#if $events_loc?.leads.auth_exhibit_kv[$events_slct.exhibit_id]}
Auto hide on sign in:

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

@@ -30,7 +30,7 @@ export async function load({ parent }) {
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});
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;

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

@@ -30,7 +30,7 @@ export async function load({ parent }) {
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});
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;
@@ -51,7 +51,8 @@ export async function load({ parent }) {
ds_code = 'hub__page__sponsorships__create_info_header';
ds_type = 'text';
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})
// 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_ ds_results = `, ds_results);
@@ -110,7 +111,8 @@ export async function load({ parent }) {
ds_code = 'hub__page__sponsorships__create_info';
ds_type = 'text';
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})
// 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_ ds_results = `, ds_results);
@@ -187,15 +189,20 @@ export async function load({ parent }) {
// // console.log(`ae_loc_tmp = `, ae_loc_tmp);
// data['ae_loc'] = ae_loc_tmp;
data['ae_ds'] = ds_code_li;
// data['ae_ds'] = ds_code_li;
ae_acct['ds'] = {
...ae_acct['ds'],
...ds_code_li
};
// ae_acct['ds'] = {
// ...ae_acct['ds'],
// ...ds_code_li
// };
// ae_acct['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;

2
src/routes/sponsorships/+page.svelte
View File

@@ -1,5 +1,5 @@
<script lang="ts">
export let data;
export let data: any;
// console.log(`ae_ Svelte Sponsorships +page data:`, data);