I guess this is better than it was...
This commit is contained in:
@@ -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 { ae_util } from '$lib/ae_utils';
|
||||
|
||||
if (!$ae_api.account_id || !$ae_api.headers['x-account-id']) {
|
||||
console.log(`Account ID not set. Redirecting to root if can not fix.`);
|
||||
// if (!$ae_api.account_id || !$ae_api.headers['x-account-id']) {
|
||||
// console.log(`Account ID not set. Redirecting to root if can not fix.`);
|
||||
|
||||
if ($ae_loc.account_id) {
|
||||
$ae_api.account_id = $ae_loc.account_id;
|
||||
$ae_api.headers['x-account-id'] = $ae_loc.account_id;
|
||||
} else {
|
||||
console.log(`Account ID not set!!!`);
|
||||
}
|
||||
}
|
||||
// if ($ae_loc.account_id) {
|
||||
// $ae_api.account_id = $ae_loc.account_id;
|
||||
// $ae_api.headers['x-account-id'] = $ae_loc.account_id;
|
||||
// } else {
|
||||
// console.log(`Account ID not set!!!`);
|
||||
// }
|
||||
// }
|
||||
|
||||
$events_loc.qry__enabled = 'enabled';
|
||||
$events_loc.qry__hidden = 'not_hidden';
|
||||
$events_loc.qry__limit = 25;
|
||||
$events_loc.qry__offset = 0;
|
||||
|
||||
// Quickly save the data passed from the parent to the Svelte stores.
|
||||
$events_slct.event_id = data.ae_slct.event_id
|
||||
$events_slct.event_obj = data.ae_slct.event_obj
|
||||
$events_slct.exhibit_obj_li = data.ae_slct.event_exhibit_obj_li
|
||||
// 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);
|
||||
|
||||
$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(() => {
|
||||
console.log('Events Leads: +layout.svelte');
|
||||
|
||||
// console.log('ae_ slct:', $slct);
|
||||
|
||||
// console.log(window.location.href);
|
||||
let href_url = window.location.href;
|
||||
// let href_url = window.location.href;
|
||||
// $ae_loc.href_url = href_url;
|
||||
// console.log(`$ae_loc.href_url = `, $ae_loc.href_url);
|
||||
|
||||
@@ -52,7 +55,7 @@ onMount(() => {
|
||||
|
||||
|
||||
<svelte:head>
|
||||
<title>Events Leads - {data.ae_loc.title}</title>
|
||||
<title>Events Leads - {$events_loc.title}</title>
|
||||
</svelte:head>
|
||||
|
||||
|
||||
|
||||
@@ -3,37 +3,40 @@ console.log(`ae_events_leads +layout.ts start`);
|
||||
|
||||
import { events_func } from '$lib/ae_events_functions';
|
||||
|
||||
|
||||
export async function load({ parent }) {
|
||||
|
||||
let data = await parent();
|
||||
|
||||
if (data.ae_loc.account_id) {
|
||||
} else {
|
||||
console.log(`The account_id was not found in the data.ae_loc!!!`);
|
||||
let account_id = data.account_id;
|
||||
let ae_acct = data[account_id];
|
||||
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;
|
||||
}
|
||||
|
||||
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!!!`);
|
||||
let event_id = ae_acct.slct.event_id;
|
||||
if (!event_id) {
|
||||
console.log(`events_leads +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: 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;
|
||||
data.ae_slct.event_obj = await load_event_obj;
|
||||
ae_acct.slct.event_obj = 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);
|
||||
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;
|
||||
|
||||
}
|
||||
|
||||
// export const prerender = true;
|
||||
// export const prerender = false;
|
||||
// export const prerender = true;
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
export let data: any;
|
||||
// export let data: any;
|
||||
// console.log(`ae_events_leads +page data:`, data);
|
||||
// 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_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 = '';
|
||||
let disable_open_lead_retrieval_btn: boolean = true;
|
||||
let disable_reset_passcode_btn: boolean = true;
|
||||
let reset_passcode: string = '';
|
||||
|
||||
|
||||
onMount(() => {
|
||||
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>
|
||||
|
||||
|
||||
|
||||
@@ -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.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.ae_loc:`, data.ae_loc);
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
<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);
|
||||
|
||||
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_func } from '$lib/ae_events_functions';
|
||||
|
||||
// Quickly save the data passed from the parent to the Svelte stores.
|
||||
$events_slct.exhibit_id = data.ae_slct.event_exhibit_id;
|
||||
$events_slct.exhibit_obj = data.ae_slct.event_exhibit_obj;
|
||||
$events_slct.exhibit_tracking_obj_li = data.ae_slct.event_exhibit_tracking_obj_li;
|
||||
// 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);
|
||||
|
||||
$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_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 event_exhibit_obj = liveQuery(
|
||||
() => db_events.exhibits.get($events_slct.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});
|
||||
|
||||
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) {
|
||||
console.log(`load_event_exhibit_obj = `, result);
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
/** @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';
|
||||
|
||||
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.route:`, route);
|
||||
// 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();
|
||||
// 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;
|
||||
|
||||
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!!!`);
|
||||
if (!account_id) {
|
||||
console.log(`events_leads exhibit [slug] +page.ts: The account_id was not found in the data!!!`);
|
||||
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);
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user