Creating version to of the data store element. Hopefully better now.

2024-09-16 18:10:55 -04:00
parent 9fd84183d7
commit 1e3086560d
11 changed files with 833 additions and 119 deletions
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -61,7 +61,7 @@ import type { key_val } from '$lib/ae_stores';

 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';
+import Element_data_store from '$lib/element_data_store_v2.svelte';

 // let account_id = localStorage.getItem('ae_account_id');
 // console.log(`account_id = `, account_id);
@@ -93,33 +93,28 @@ $slct = {
 }
 // console.log(`$slct = `, $slct);

+// There should almost always be an event_id set.
 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) {
    // console.log(`Event ID already set:`, $events_slct.event_id);
    $events_loc.event_id = $events_slct.event_id;
-} else if ($ae_loc.default__event_id) {
-    $events_slct.event_id = $ae_loc.default__event_id;
-    $events_loc.event_id = $ae_loc.default__event_id;
 } else {
-    console.log(`No Event ID set.`);
+    console.log(`No Event ID set!`);
 }

+// This is mainly for Precon CHOW
 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 if ($ae_loc.sponsorship_cfg_id) {
+    $slct.sponsorship_cfg_id = $ae_loc.sponsorship_cfg_id;
+    $ae_loc.mod.sponsorships.cfg_id = $ae_loc.sponsorship_cfg_id;
 } else {
    console.log(`No Sponsorship Config ID set.`);
 }

-if (!$ae_loc.user_email) {
-    $ae_loc.user_email = 'test@oneskyit.com';
-}
-
 if (browser) {
    // Waiting until the browser exists.
    if ($ae_loc && $ae_sess && $ae_loc.ver_idb != $ae_sess.ver_idb) {
--- a/src/routes/+layout.ts
+++ b/src/routes/+layout.ts
@@ -161,7 +161,6 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
            ae_loc_init['site_style_href'] = site_domain_results.style_href;
            ae_loc_init['site_google_tracking_id'] = site_domain_results.google_tracking_id;
            ae_loc_init['site_access_code_kv'] = site_domain_results.access_code_kv_json;
-            ae_loc_init['page_access_code_li'] = site_domain_results.access_code_kv_json; // Old style. This is only temporary. Start using site_*_kv version.
            ae_loc_init['site_cfg_json'] = site_domain_results.cfg_json;

            console.log(`root layout.ts: Returning account_id = `, site_domain_results.account_id_random);
@@ -183,28 +182,6 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
    }
    // console.log(ae_loc_init);

-    // 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';
-    // ds_code = 'hub__page__access_code_li_json';
-    // // console.log(`INFO: ae_ account_id = `, account_id);
-    // // ae_acct['ds'][ds_code]
-    // 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) {
-    //     if (ds_results) {
-    //         console.log(`ae_ ds_results = `, ds_results);
-    //         return ds_results;
-    //     }
-
-    // }
-    // );
-
-    // ae_loc_init['page_access_code_li'] = ds_code_li['hub__page__access_code_li_json'];
-
    ae_acct['api'] = ae_api_init;
    ae_acct['loc'] = ae_loc_init;
    ae_acct['ds'] = ds_code_li;
@@ -214,11 +191,11 @@ export async function load({ fetch, params, parent, route, url }) { // params, r
        '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,
+        '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,
+        'sponsorship_cfg_id': ae_loc_init.site_cfg_json?.slct__sponsorship_cfg_id,
    }
    // console.log(`ae_acct = `, ae_acct);

--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -8,7 +8,7 @@ import { onMount } from 'svelte';
 // import { PUBLIC_TESTING } from '$env/static/public';
 // console.log(`AE Config - +page.svelte PUBLIC_TESTING:`, PUBLIC_TESTING);

-import Element_data_store from '$lib/element_data_store.svelte';
+import Element_data_store from '$lib/element_data_store_v2.svelte';

 // import { api } from '$lib/api';
 import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores';
--- a/src/routes/admin/+layout.svelte
+++ b/src/routes/admin/+layout.svelte
@@ -35,49 +35,9 @@ $events_slct.event_obj = ae_acct.slct.event_obj;

 let ae_promises: key_val = {};

-// if (ae_acct.loc.site_cfg_json.slct__event_id) {
-//     $events_slct.event_id = ae_acct.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) {
-//     $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.`);
-// }
-
-// if ($events_slct.event_id) {
-//     $events_trigger = 'load__event_obj';
-// }
-
-
-// Updated 2024-03-06
-// $: if ($events_trigger == 'load__event_obj' && $events_slct.event_id) {
-//     console.log(`$events_slct.event_id=${$events_slct.event_id}`);
-//     $events_trigger = null;
-
-//     let load_obj_results = handle_load_ae_obj_id__event({event_id: $events_slct.event_id, try_cache: false})
-//     .then(function (load_obj_results) {
-//         if (load_obj_results) {
-//             console.log(`load_obj_results=`, load_obj_results);
-//         } else {
-//             console.log('No results returned.');
-//         }
-//     });
-//     $events_slct.event_obj = load_obj_results;
-//     console.log(`load_obj_results=`, load_obj_results);
-// }
-

 onMount(() => {
    console.log('Admin: +layout.svelte');
-
-    // 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
--- a/src/routes/events_badges/+layout.svelte
+++ b/src/routes/events_badges/+layout.svelte
@@ -31,23 +31,6 @@ $events_slct.event_obj = ae_acct.slct.event_obj;

 let ae_promises: key_val = {};

-// if (ae_acct.loc.site_cfg_json.slct__event_id) {
-//     $events_slct.event_id = ae_acct.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) {
-//     $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.`);
-// }
-
-// if ($events_slct.event_id) {
-//     $events_trigger = 'load__event_obj';
-// }
-

 // Updated 2024-03-06
 // $: if ($events_trigger == 'load__event_obj' && $events_slct.event_id) {
--- a/src/routes/events_badges/review/+page.svelte
+++ b/src/routes/events_badges/review/+page.svelte
@@ -333,7 +333,7 @@ function handle_qr_camera(event) {
 <!-- {#if $ae_loc.ds.hub__page__events_badges__create_info_header} -->
 {#if $ae_loc.iframe}
    <span class="flex flex-row items-center justify-center">
-    <img src={$ae_loc.site_cfg_json.header_image_path} alt="header" class="w-auto max-h-20 m-2" />
+    <img src={$ae_loc.site_cfg_json?.header_image_path} alt="header" class="w-auto max-h-20 m-2" />
    <h1 class="h3 text-center m-2">Review &amp; Print<br>Your Badge</h1>
    </span>
 {:else}
--- a/src/routes/events_badges/stats/+page.svelte
+++ b/src/routes/events_badges/stats/+page.svelte
@@ -340,7 +340,7 @@ function handle_qr_camera(event) {
 <!-- {#if $ae_loc.ds.hub__page__events_badges__create_info_header} -->
 {#if $ae_loc.iframe}
    <span class="flex flex-row items-center justify-center">
-    <img src={$ae_loc.site_cfg_json.header_image_path} alt="header" class="w-auto max-h-20 m-2" />
+    <img src={$ae_loc.site_cfg_json?.header_image_path} alt="header" class="w-auto max-h-20 m-2" />
    <h1 class="h3 text-center m-2">Review &amp; Print<br>Your Badge</h1>
    </span>
 {:else}