diff --git a/package-lock.json b/package-lock.json index 382484ac..a8912e7e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2209,9 +2209,9 @@ } }, "node_modules/dayjs": { - "version": "1.11.11", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.11.tgz", - "integrity": "sha512-okzr3f11N6WuqYtZSvm+F776mB41wRZMhKP+hc34YdW+KmtYYK9iqvHSwo2k9FEH3fhGXvOPV6yz2IcSrfRUDg==", + "version": "1.11.12", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.12.tgz", + "integrity": "sha512-Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==", "license": "MIT" }, "node_modules/debug": { diff --git a/src/routes/core/person/[person_id]/+page.ts b/src/routes/core/person/[person_id]/+page.ts index a46b0dc6..3415b58e 100644 --- a/src/routes/core/person/[person_id]/+page.ts +++ b/src/routes/core/person/[person_id]/+page.ts @@ -1,30 +1,27 @@ /** @type {import('./$types').PageLoad} */ -console.log(`ae_p_person [slug] +page.ts: start`); +import { error } from '@sveltejs/kit'; +console.log(`ae core person [person_id] +page.ts: start`); import { core_func } from '$lib/ae_core_functions'; export async function load({ params, parent }) { // route let log_lvl = 0; - // console.log(`ae_events_pres_mgmt_event +page.ts data.params:`, params); - // console.log(`ae_events_pres_mgmt_event +page.ts data.route:`, route); - // console.log(`ae_events_pres_mgmt_event +page.ts data.url:`, url); let data = await parent(); - // console.log(`ae_core person slug +page.ts data:`, data); + // console.log(`ae core person [person_id] +page.ts data:`, data); data.log_lvl = log_lvl; + let account_id = data.account_id; let ae_acct = data[account_id]; console.log(`ae_acct = `, ae_acct); let person_id = params.person_id; - let person_id_test = data.params.person_id; console.log(`person_id = `, person_id); - // console.log(`person_id_test = `, person_id_test); if (!person_id) { - console.log(`ae_p_person [slug] +page.ts: The person_id was not found in the params.slug!!!`); - // return false; - // return data; - return {status: 404, error: {message: 'Person not found.'}}; + console.log(`ae core person [person_id] +page.ts: The person_id was not found in the params!!!`); + error(404, { + message: 'Session not found' + }); } ae_acct.slct.person_id = person_id; @@ -33,24 +30,6 @@ export async function load({ params, parent }) { // route ae_acct.slct.person_obj = load_person_obj; - // let load_event_file_obj_li = await core_func.handle_load_ae_obj_li__event_file({ - // api_cfg: ae_acct.api, - // for_obj_type: 'person', - // for_obj_id: person_id, - // params: {enabled: 'all', qry__limit: 50}, - // try_cache: false - // }) - // .then((event_file_obj_li) => { - // if (log_lvl) { - // console.log(`event_file_obj_li = `, event_file_obj_li); - // } - // return event_file_obj_li; - // }); - // if (log_lvl) { - // console.log(`load_event_file_obj_li = `, load_event_file_obj_li); - // } - // ae_acct.slct.event_file_obj_li = load_event_file_obj_li; - // WARNING: Precaution against shared data between sites and presentations. data[account_id] = ae_acct; diff --git a/src/routes/events_badges/review/+layout.ts b/src/routes/events_badges/review/+layout.ts index d6cdb592..d94b935b 100644 --- a/src/routes/events_badges/review/+layout.ts +++ b/src/routes/events_badges/review/+layout.ts @@ -10,9 +10,7 @@ import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; export async function load({ params, parent, url }) { // route - console.log(`ae_events_badges [slug] +layout.ts data.params:`, params); - // console.log(`ae_events_badges [slug] +layout.ts data.route:`, route); - // console.log(`ae_events_badges [slug] +layout.ts data.url:`, url); + let log_lvl = 0; let data = await parent(); console.log(`Svelte Events Badges [slug] +layout.ts data = data:`, data); @@ -25,7 +23,6 @@ export async function load({ params, parent, url }) { // route let ds_code: null|string = null; let ds_type: null|string = null; - let data_struct = { ae_init: ae_loc_tmp, params: params, @@ -35,7 +32,6 @@ export async function load({ params, parent, url }) { // route { slug: 'test', title: 'Test' }, ], url: url, - }; let loading_results = null; diff --git a/src/routes/events_badges/stats/+layout.ts b/src/routes/events_badges/stats/+layout.ts index ebfdb1fe..02a50777 100644 --- a/src/routes/events_badges/stats/+layout.ts +++ b/src/routes/events_badges/stats/+layout.ts @@ -16,10 +16,6 @@ import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; * Returns: data object (parent to child) export async function load({ params, parent, url }) { // route - console.log(`ae_events_badges [slug] +layout.ts data.params:`, params); - // console.log(`ae_events_badges [slug] +layout.ts data.route:`, route); - // console.log(`ae_events_badges [slug] +layout.ts data.url:`, url); - let data = await parent(); console.log(`Svelte Events Badges [slug] +layout.ts data = data:`, data); diff --git a/src/routes/events_leads/+page.ts b/src/routes/events_leads/+page.ts index 7f0cdfa9..564ea188 100644 --- a/src/routes/events_leads/+page.ts +++ b/src/routes/events_leads/+page.ts @@ -4,9 +4,6 @@ console.log(`ae_events_leads +page.ts start`); import { events_func } from '$lib/ae_events_functions'; export async function load({ params, parent, url }) { // 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); let data = parent(); // console.log(`ae_events_leads +page.ts data:`, data); @@ -35,7 +32,7 @@ export async function load({ params, parent, url }) { // route // 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}); // console.log(`load_event_exhibit_obj_li = `, load_event_exhibit_obj_li); - // let exhibit_id = data.params.slug; + // let exhibit_id = params.slug; // let load_event_exhibit_obj = events_func.handle_load_ae_obj_id__exhibit({api_cfg: data.ae_api, exhibit_id: exhibit_id, try_cache: false}); // console.log(`load_event_exhibit_obj = `, load_event_exhibit_obj); diff --git a/src/routes/events_leads/exhibit/[slug]/+page.svelte b/src/routes/events_leads/exhibit/[slug]/+page.svelte index baa3f795..312f8d10 100644 --- a/src/routes/events_leads/exhibit/[slug]/+page.svelte +++ b/src/routes/events_leads/exhibit/[slug]/+page.svelte @@ -32,8 +32,6 @@ import Leads_list from './leads_list.svelte'; import Leads_manage from './leads_manage.svelte'; 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) diff --git a/src/routes/events_leads/exhibit/[slug]/+page.ts b/src/routes/events_leads/exhibit/[slug]/+page.ts index ca27c5e1..70f0cfec 100644 --- a/src/routes/events_leads/exhibit/[slug]/+page.ts +++ b/src/routes/events_leads/exhibit/[slug]/+page.ts @@ -3,13 +3,11 @@ console.log(`ae_events_leads [slug] +page.ts start`); import { events_func } from '$lib/ae_events_functions'; -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); +export async function load({ params, parent }) { // route + let log_lvl = 0; let data = await parent(); - // console.log(`ae_events_leads +page.ts data:`, data); + // console.log(`ae_events_leads exhibit [slug] +page.ts data:`, data); let account_id = data.account_id; let ae_acct = data[account_id]; @@ -22,11 +20,9 @@ export async function load({ parent }) { // route data.ae_events_leads_exhibit_slug_page_ts = true; - // let param_slug_event_exhibit_id = data.params.slug; - - let event_exhibit_id = data.params.slug; + let event_exhibit_id = 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!!!`); + console.log(`events_leads exhibit [slug] +page.ts: The event_exhibit_id was not found in the params.slug!!!`); return false; } @@ -37,8 +33,8 @@ export async function load({ parent }) { // route 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, + api_cfg: ae_acct.api, + exhibit_id: event_exhibit_id, params: {enabled: 'all', qry__limit: 550}, try_cache: false }); diff --git a/src/routes/events_leads/exhibit/[slug]/leads_payment.svelte b/src/routes/events_leads/exhibit/[slug]/leads_payment.svelte index bc3bfd7f..7eba0bc9 100644 --- a/src/routes/events_leads/exhibit/[slug]/leads_payment.svelte +++ b/src/routes/events_leads/exhibit/[slug]/leads_payment.svelte @@ -1,15 +1,10 @@