Trying to make things work better...

This commit is contained in:
Scott Idem
2024-03-26 14:24:35 -04:00
parent 040e1e71e3
commit 4d486a580c
22 changed files with 508 additions and 410 deletions

View File

@@ -1,6 +1,6 @@
<script lang="ts">
/** @type {import('./$types').LayoutData} */
export let data;
export let data: any;
import { goto } from '$app/navigation';
import type { Writable } from 'svelte/store';
import { localStorageStore } from '@skeletonlabs/skeleton';
@@ -10,6 +10,7 @@ import type { key_val } from '$lib/ae_stores';
import { api } from '$lib/api';
import { ae_loc, ae_sess, ae_api, slct } from '$lib/ae_stores';
import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores';
import { onMount } from 'svelte';
// import Element_data_store from '$lib/element_data_store.svelte';
@@ -19,15 +20,15 @@ import { events_loc, events_slct, events_trigger } from '$lib/ae_events_stores';
let ae_promises: key_val = {};
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) {
if (data.ae_loc.site_cfg_json.slct__event_id) {
$events_slct.event_id = data.ae_loc.site_cfg_json.slct__event_id;
$events_loc.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;
$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.`);
}
@@ -55,6 +56,13 @@ $: if ($events_trigger == 'load__event_obj' && $events_slct.event_id) {
}
onMount(() => {
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
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} api_cfg=`, $ae_api);

View File

@@ -40,3 +40,6 @@ export async function load({ params, parent, url }) { // route
return data;
}
// export const prerender = false;
export const prerender = true;

View File

@@ -1,7 +1,7 @@
<script lang="ts">
export let data;
export let data: any;
console.log(`ae_events_badges +page data:`, data);
console.log(`ae_events_badges Data Params:`, data.url.searchParams.get('event_id'));
// console.log(`ae_events_badges Data Params:`, data.url.searchParams.get('event_id'));
import { onMount } from 'svelte';
@@ -13,19 +13,6 @@ import { ae_util } from '$lib/ae_utils';
import Element_data_store from '$lib/element_data_store.svelte';
// 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.`);
// }
onMount(() => {
console.log('Events Badges: +page.svelte');

View File

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