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

Various bug fixes for CHOW

Browse Source
This commit is contained in:
Scott Idem
2024-04-01 20:48:16 -04:00
parent 78b5fc1068
commit 3abe92a2dc
11 changed files with 77 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/ae_sponsorships_functions.ts
View File

@@ -36,7 +36,7 @@ async function handle_load_ae_obj_id__sponsorship_cfg(
let params = {};
// ae_loc.hub.sponsorships.qry_status = 'loading';
ae_promises.load__sponsorship_cfg_obj = await api.get_ae_obj_id_crud({
ae_promises.load__sponsorship_cfg_obj = api.get_ae_obj_id_crud({
api_cfg: api_cfg,
obj_type: 'sponsorship_cfg',
obj_id: sponsorship_cfg_id,
@@ -49,6 +49,8 @@ async function handle_load_ae_obj_id__sponsorship_cfg(
if (sponsorship_cfg_obj_get_result) {
if (log_lvl) {
console.log(`*ae_func* Got a result for sponsorship_cfg_id ${sponsorship_cfg_id}`);
} else if (log_lvl > 1) {
console.log(`*ae_func* Got a result for sponsorship_cfg_id ${sponsorship_cfg_id}:`, sponsorship_cfg_obj_get_result);
}
return sponsorship_cfg_obj_get_result;
} else {

6
src/lib/api.js
View File

@@ -188,7 +188,7 @@ export let get_object = async function get_object(
)
.then(function (response) {
if (log_lvl) {
console.log(`GET Response: status=${response.status} statusText=${response.statusText} baseURL=${response.config.baseURL} url=${response.config.url} method=${response.config.method} headers=${response.config.headers} params=${response.config.params}`);
console.log(`GET Response: status=${response.status} statusText=${response.statusText} baseURL=${response.config.baseURL} url=${response.config.url} method=${response.config.method} headers=${response.config.headers} params=${JSON.stringify(response.config.params)}`);
}
if (log_lvl > 1) {
console.log('GET Response:', response);
@@ -1205,9 +1205,9 @@ export let update_ae_obj_id_crud = async function update_ae_obj_id_crud({api_cfg
// Updated 2023-11-14
export let delete_ae_obj_id_crud = async function delete_ae_obj_id_crud({api_cfg, obj_type, obj_id, field_name, field_value, fields={}, key, jwt=null, headers={}, params={}, data={}, method='delete', return_meta=false, log_lvl=0}) {
export let delete_ae_obj_id_crud = async function delete_ae_obj_id_crud({api_cfg, obj_type, obj_id, key, jwt=null, headers={}, params={}, data={}, method='delete', return_meta=false, log_lvl=0}) {
if (log_lvl) {
console.log('*** delete_ae_obj_id_crud() ***');
console.log(`*** delete_ae_obj_id_crud() *** obj_type: ${obj_type} obj_id: ${obj_id}`);
}
data['super_key'] = key;

1
src/routes/+layout.svelte
View File

@@ -89,6 +89,7 @@ $slct = {
...$slct,
...ae_acct.slct,
}
console.log(`$slct = `, $slct);
if ($ae_loc.site_cfg_json.slct__event_id) {
$events_slct.event_id = $ae_loc.site_cfg_json.slct__event_id;

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

@@ -103,10 +103,10 @@ let ae_event_presenter_obj_get_promise: Promise<any>;
// This might need to be reviewed and compared to sponsorships version again
if ($ae_loc.mod.events.event_id) {
$slct.event_id = $ae_loc.mod.events.event_id;
// handle_load_ae_obj_id__event({event_id: $slct.event_id, try_cache: false});
if ($slct.event_id) {
handle_load_ae_obj_li__event_presenter({event_id: $slct.event_id, try_cache: false});
// $slct.event_id = $ae_loc.mod.events.event_id;
// handle_load_ae_obj_id__event({event_id: $slct.event_id, try_cache: false});
}
@@ -184,10 +184,20 @@ async function handle_load_ae_obj_li__event_presenter({event_id, try_cache=true}
console.log('*** handle_load_ae_obj_li__event_presenter() ***');
// console.log($ae_loc.mod.events);
let enabled = $ae_loc.mod.events.enabled;
let hidden = $ae_loc.mod.events.hidden;
let limit = $ae_loc.mod.events.limit;
let offset = $ae_loc.mod.events.offset;
let enabled: string = ($ae_loc.qry__enabled ?? 'enabled'); // all, disabled, enabled
let hidden: string = ($ae_loc.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden
let limit: number = ($ae_loc.qry__limit ?? 99); // 99
let offset: number = ($ae_loc.qry__offset ?? 0); // 0
if ($ae_loc.administrator_access) {
enabled = 'all';
hidden = 'all';
}
// let enabled = $ae_loc.mod.events.enabled;
// let hidden = $ae_loc.mod.events.hidden;
// let limit = $ae_loc.mod.events.limit;
// let offset = $ae_loc.mod.events.offset;
let params = {};

38
src/routes/events_speakers/[slug]/+layout.ts
View File

@@ -1,5 +1,5 @@
/** @type {import('./$types').LayoutLoad} */
console.log(`ae_events_speakers slug +layout.ts start`);
console.log(`ae_events_speakers [slug] +layout.ts start`);
import { get } from 'svelte/store';
@@ -16,28 +16,28 @@ export async function load({ params, url }) { // route
// let ae_loc_tmp = get(ae_loc);
// console.log(`ae_loc = `, ae_loc_tmp);
let ds_code_li: null|key_val = ae_loc_tmp.ds;
// console.log(`ae_ ds_code_li = `, ds_code_li);
let ds_code: null|string = null;
let ds_type: null|string = null;
// let ds_code_li: null|key_val = ae_loc_tmp.ds;
// // console.log(`ae_ ds_code_li = `, ds_code_li);
// let ds_code: null|string = null;
// let ds_type: null|string = null;
let data_struct = {
// ae_init: ae_loc_tmp,
params: params,
sections: [
{ slug: 'new', title: 'New Event Presenter' },
{ slug: 'manage', title: 'Manage' },
{ slug: 'test', title: 'Test' },
],
url: url,
// let data_struct = {
// // ae_init: ae_loc_tmp,
// params: params,
// sections: [
// { slug: 'new', title: 'New Event Presenter' },
// { slug: 'manage', title: 'Manage' },
// { slug: 'test', title: 'Test' },
// ],
// url: url,
};
// };
let loading_results = null;
// let loading_results = null;
ds_code = 'hub__page__events_speakers__create_info';
ds_type = 'text';
// ds_code = 'hub__page__events_speakers__create_info';
// ds_type = 'text';
// loading_results = await handle_get_data_store_obj_w_code({ code: ds_code })
// .then( function (ds_hub_page_events_create_info_results) {
// if (ds_hub_page_events_create_info_results) {
@@ -91,7 +91,7 @@ export async function load({ params, url }) { // route
// console.log(`ae_loc = `, get(ae_loc));
// });
return data_struct;
// return data_struct;
}

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

@@ -95,17 +95,17 @@ onMount(() => {
// Load the Event Obj with ID based on the URL param.
$slct.event_id = data.url.searchParams.get('event_id');
$slct_trigger = 'load__event_obj';
// $slct.event_id = data.url.searchParams.get('event_id');
// $slct_trigger = 'load__event_obj';
$: if ($slct_trigger == 'load__event_obj' && $slct.event_id) {
console.log('Selected Event ID:', $slct.event_id);
// $: if ($slct_trigger == 'load__event_obj' && $slct.event_id) {
// console.log('Selected Event ID:', $slct.event_id);
$slct_trigger = null;
// $slct_trigger = null;
handle_load_ae_obj_id__event({event_id: $slct.event_id, try_cache: false});
}
// handle_load_ae_obj_id__event({event_id: $slct.event_id, try_cache: false});
// }
async function handle_load_ae_obj_id__event({event_id, try_cache=false}) {
console.log(`*** handle_load_ae_obj_id__event() *** event_id=${event_id}`);

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

@@ -25,7 +25,8 @@ $ae_loc.mod.sponsorships.level_guest_max_li = {
7: 16, // CHOW 2024 - Premier Partner
};
// $slct.sponsorship_cfg_id = ae_acct.slct.sponsorship_cfg_id;
// $slct.sponsorship_cfg_obj = ae_acct.slct.sponsorship_cfg_obj;
// Setting the sponsorship_cfg_obj here seems to be important. It does not behave correctly if you navigate from the main (root) page for the site. The sponsorship level drop down is missing (probably more). - 2024-04-01
$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
// if (ae_acct.ds) {

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

@@ -30,10 +30,16 @@ 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});
// The await at this point seems to be important. If it is in the sponsor function then the data is not available to the layout. - 2024-04-01
let load_sponsorship_cfg_obj = await spons_func.handle_load_ae_obj_id__sponsorship_cfg({
api_cfg: ae_acct.api,
sponsorship_cfg_id: sponsorship_cfg_id,
try_cache: false,
log_lvl: 0
});
ae_acct.slct.sponsorship_cfg_id = sponsorship_cfg_id;
ae_acct.slct.sponsorship_cfg_obj = await load_sponsorship_cfg_obj;
ae_acct.slct.sponsorship_cfg_obj = load_sponsorship_cfg_obj;
data.ae_sponsorships_layout_ts = true;

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

@@ -173,10 +173,20 @@ async function handle_load_ae_obj_li__sponsorship({account_id, try_cache=true})
console.log('*** handle_load_ae_obj_li__sponsorship() ***');
// console.log($ae_loc.mod.sponsorships);
let enabled = $ae_loc.mod.sponsorships.enabled;
let hidden = $ae_loc.mod.sponsorships.hidden;
let limit = $ae_loc.mod.sponsorships.limit;
let offset = $ae_loc.mod.sponsorships.offset;
let enabled: string = ($ae_loc.qry__enabled ?? 'enabled'); // all, disabled, enabled
let hidden: string = ($ae_loc.qry__hidden ?? 'not_hidden'); // all, hidden, not_hidden
let limit: number = ($ae_loc.qry__limit ?? 99); // 99
let offset: number = ($ae_loc.qry__offset ?? 0); // 0
if ($ae_loc.administrator_access) {
enabled = 'all';
hidden = 'all';
}
// let enabled = $ae_loc.mod.sponsorships.enabled;
// let hidden = $ae_loc.mod.sponsorships.hidden;
// let limit = $ae_loc.mod.sponsorships.limit;
// let offset = $ae_loc.mod.sponsorships.offset;
let params = {};

1
src/routes/sponsorships/[slug]/+layout.ts
View File

@@ -1,4 +1,5 @@
/** @type {import('./$types').LayoutLoad} */
console.log(`ae_sponsorships [slug] +layout.ts start`);
import { get } from 'svelte/store';

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

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