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

Finally getting the initial loading better

Browse Source
This commit is contained in:
Scott Idem
2024-03-26 17:12:35 -04:00
parent 4d486a580c
commit f20c6ef706
10 changed files with 139 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/events_badges/+layout.ts
View File

@@ -32,7 +32,7 @@ export async function load({ params, parent, url }) { // route
manage: {name: 'Manage', href: '/events_badges/manage', access: 'administrator', disable: true, hide: true},
review: {name: 'Review', href: '/events_badges/review', access: false, disable: true, hide: false},
print: {name: 'Print', href: '/events_badges/print', access: 'trusted', disable: true, hide: false},
view: {name: 'View', href: '/events_badges/view', access: 'trusted', hide: true}, // event_badge_id
// view: {name: 'View', href: '/events_badges/view', access: 'trusted', hide: true}, // event_badge_id
// new: {name: 'New', href: '/events_badges/new'},
// sponsorships: {name: 'Sponsorships', href: '/sponsorships', disable: true, hide: true},
};
@@ -42,4 +42,4 @@ export async function load({ params, parent, url }) { // route
}
// export const prerender = false;
export const prerender = true;
// export const prerender = true;

4
src/routes/events_badges/+page.svelte
View File

@@ -25,8 +25,8 @@ onMount(() => {
// console.log(`$ae_loc.href_url = `, $ae_loc.href_url);
// $slct_trigger = 'msg_parent';
ae_util.handle_url_and_message('event_id', $events_slct.event_id);
ae_util.handle_url_and_message('badge_id', $events_slct.badge_id);
// ae_util.handle_url_and_message('event_id', $events_slct.event_id);
// ae_util.handle_url_and_message('badge_id', $events_slct.badge_id);
// if ($events_slct.badge_id) {
// console.log(`Got an ID. Let's show the modal!`);
// modalStore.trigger(modal_edit__badge_obj);

38
src/routes/events_badges/review/+page.svelte
View File

@@ -77,12 +77,6 @@ $events_loc.show_view__event_badge_obj = false;
let ae_event_badge_get_promise: Promise<any>;
let ae_event_obj_get_promise;
// Load the AE Obj with ID based on the URL param.
if (data.url.searchParams.get('event_id')) {
console.log(`Got an event_id: ${data.url.searchParams.get('event_id')}`);
$events_slct.event_id = data.url.searchParams.get('event_id');
}
if ($events_slct.event_id) {
console.log('Selected Event ID:', $events_slct.event_id);
$events_trigger = 'load__event_badge_obj_li';
@@ -93,29 +87,20 @@ if ($events_slct.event_id) {
onMount(() => {
console.log('Events Badges [New/Edit]: +page.svelte');
// console.log(`$ae_loc = `, $ae_loc);
// Load the AE Obj with ID based on the URL param.
if (data.url.searchParams.get('event_id')) {
$events_loc.event_id = data.url.searchParams.get('event_id');
$events_slct.event_id = data.url.searchParams.get('event_id');
}
// Load the Event Presenter Obj with ID based on the URL param.
if (data.url.searchParams.get('event_badge_id')) {
$events_slct.badge_id = data.url.searchParams.get('event_badge_id');
}
let url = window.location.href;
// console.log(url);
$ae_loc.href_url = url;
// console.log(`$ae_loc.href_url = `, $ae_loc.href_url);
// ae_util.handle_url_and_message('event_badge_id', $events_slct.event_badge_id);
// if ($events_slct.event_badge_id) {
// console.log(`Got an ID. Let's show the modal!`);
// modalStore.trigger(modal_edit__event_badge);
// } else {
// console.log(`No ID. Nothing to show.`);
// }
});
// console.log(`$ae_loc = `, $ae_loc);
// $ae_loc.href_url = url;
// console.log(`$ae_loc.href_url = `, $ae_loc.href_url);
$: if ($events_trigger == 'load__event_obj' && $events_slct.event_id) {
@@ -168,9 +153,6 @@ async function handle_load_ae_obj_id__event({event_id, try_cache=false}) {
}
// Load the Event Presenter Obj with ID based on the URL param.
// $events_slct.event_badge_id = data.url.searchParams.get('ae_id');
$events_slct.event_badge_id = data.url.searchParams.get('event_badge_id');
if ($events_slct.event_badge_id) {
console.log('Selected Event Presenter ID:', $events_slct.event_badge_id);
$events_trigger = 'load__event_badge';