From e9a8f7df000304d28887997529b1b88e065c5a59 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Thu, 13 Nov 2025 18:38:00 -0500 Subject: [PATCH] This was a lot... things are mostly working again. The changing of id_random properties caused some problems. The hosted_file_hash_sha256 is not working? There are other issues as well... This will take some time. --- src/lib/ae_api/api_get__crud_obj_id.ts | 2 +- src/lib/ae_api/api_get__crud_obj_li_v1.ts | 2 +- src/lib/ae_api/api_get__crud_obj_li_v2.ts | 2 +- src/lib/ae_api/api_get_object.ts | 2 +- src/lib/ae_api/api_get_object_v1.ts | 2 +- src/lib/ae_archives/ae_archives__archive.ts | 2 +- .../ae_archives__archive_content.ts | 4 +- .../ae_comp__hosted_files_clip_video.svelte | 4 +- ...ae_comp__hosted_files_clip_video_li.svelte | 4 +- ...ae_comp__hosted_files_clip_video_v1.svelte | 4 +- ..._comp__hosted_files_download_button.svelte | 4 +- .../ae_comp__hosted_files_upload.svelte | 4 +- src/lib/ae_core/ae_core_functions.ts | 2 +- src/lib/ae_core/core__activity_log.ts | 2 +- src/lib/ae_core/core__api_helpers.ts | 2 +- .../core__check_hosted_file_obj_w_hash.ts | 2 +- src/lib/ae_core/core__countries.ts | 2 +- src/lib/ae_core/core__country_subdivisions.ts | 2 +- src/lib/ae_core/core__crud_generic.ts | 2 +- src/lib/ae_core/core__data_store.ts | 2 +- src/lib/ae_core/core__hosted_files.ts | 2 +- src/lib/ae_core/core__person.ts | 2 +- src/lib/ae_core/core__qr_code.ts | 2 +- src/lib/ae_core/core__time_zones.ts | 2 +- src/lib/ae_core/core__user.ts | 2 +- src/lib/ae_events/ae_events__event.ts | 2 +- src/lib/ae_events/ae_events__event_badge.ts | 2 +- .../ae_events__event_badge_template.ts | 2 +- src/lib/ae_events/ae_events__event_device.ts | 2 +- src/lib/ae_events/ae_events__event_file.ts | 2 +- .../ae_events/ae_events__event_location.ts | 2 +- .../ae_events__event_presentation.ts | 2 +- .../ae_events/ae_events__event_presenter.ts | 2 +- src/lib/ae_events/ae_events__event_session.ts | 2 +- src/lib/ae_events/ae_events__exhibit.ts | 2 +- src/lib/ae_journals/ae_journals__journal.ts | 2 +- .../ae_journals/ae_journals__journal_entry.ts | 2 +- src/lib/ae_journals/ae_journals_stores.ts | 2 +- src/lib/ae_posts/ae_posts__post.ts | 2 +- src/lib/ae_posts/ae_posts__post_comment.ts | 2 +- .../ae_sponsorships_functions.ts | 2 +- src/lib/api/api.ts | 10 +- .../app_components/e_app_access_type.svelte | 4 +- src/lib/app_components/e_app_cfg.svelte | 2 +- .../app_components/e_app_debug_menu.svelte | 2 +- src/lib/app_components/e_app_help_tech.svelte | 10 +- .../app_components/e_app_sign_in_out.svelte | 4 +- src/lib/app_components/e_app_sys_menu.svelte | 2 +- src/lib/app_components/e_app_theme.svelte | 2 +- .../custom/image-extended-component.svelte | 2 +- .../shad-editor/icons/block-quote.svelte | 2 +- .../components/shad-editor/icons/bold.svelte | 2 +- .../shad-editor/icons/buttle-list.svelte | 2 +- .../components/shad-editor/icons/code.svelte | 2 +- .../shad-editor/icons/highlighter.svelte | 2 +- .../shad-editor/icons/italic.svelte | 2 +- .../components/shad-editor/icons/link.svelte | 2 +- .../shad-editor/icons/ordered-list.svelte | 2 +- .../shad-editor/icons/strikethrough.svelte | 2 +- .../shad-editor/icons/subscript.svelte | 2 +- .../shad-editor/icons/superscript.svelte | 2 +- .../shad-editor/icons/task-list.svelte | 2 +- .../shad-editor/icons/textcolor.svelte | 2 +- .../shad-editor/icons/underline.svelte | 2 +- .../components/shad-editor/shad-editor.svelte | 2 +- src/lib/components/ui/button/button.svelte | 2 +- .../dropdown-menu-checkbox-item.svelte | 2 +- .../dropdown-menu-content.svelte | 2 +- .../dropdown-menu-group-heading.svelte | 2 +- .../dropdown-menu/dropdown-menu-item.svelte | 2 +- .../dropdown-menu/dropdown-menu-label.svelte | 2 +- .../dropdown-menu-radio-item.svelte | 2 +- .../dropdown-menu-separator.svelte | 2 +- .../dropdown-menu-shortcut.svelte | 2 +- .../dropdown-menu-sub-content.svelte | 2 +- .../dropdown-menu-sub-trigger.svelte | 2 +- src/lib/components/ui/input/input.svelte | 2 +- .../ui/popover/popover-content.svelte | 2 +- .../components/ui/separator/separator.svelte | 2 +- .../ui/tooltip/tooltip-content.svelte | 2 +- src/lib/element_qr_scanner_v2.svelte | 2 +- src/lib/elements/element_ae_crud.svelte | 5 +- src/lib/elements/element_ae_crud_v2.svelte | 2 +- src/lib/elements/element_data_store.svelte | 4 +- src/lib/elements/element_data_store_v2.svelte | 4 +- src/lib/elements/element_input_file.svelte | 4 +- .../elements/element_input_files_tbl.svelte | 4 +- .../element_manage_event_file_li.svelte | 6 +- .../element_manage_event_file_li_all.svelte | 4 +- ...element_manage_event_file_li_direct.svelte | 4 +- .../element_manage_hosted_file_li.svelte | 4 +- .../element_manage_hosted_file_li_all.svelte | 4 +- src/lib/elements/element_sql_qry.svelte | 2 +- src/lib/elements/element_websocket_v2.svelte | 6 +- src/lib/stores/ae_events_stores.ts | 2 +- src/lib/stores/ae_idaa_stores.ts | 2 +- src/lib/stores/ae_stores.ts | 2 +- src/routes/+layout.svelte | 6 +- src/routes/+layout.ts | 2 +- src/routes/+page.svelte | 2 +- src/routes/admin/+layout.svelte | 6 +- src/routes/admin/+page.svelte | 4 +- src/routes/core/+layout.svelte | 4 +- src/routes/core/+page.svelte | 6 +- .../core/ae_comp__person_obj_tbl.svelte | 4 +- .../core/person/[person_id]/+page.svelte | 6 +- src/routes/core/person_view.svelte | 6 +- src/routes/events/+layout.svelte | 6 +- src/routes/events/+page.svelte | 13 +- .../[event_id]/(badges)/badges/+layout.svelte | 6 +- .../[event_id]/(badges)/badges/+page.svelte | 5 +- .../(badges)/badges/[badge_id]/+page.svelte | 2 +- .../[badge_id]/ae_comp__badge_obj_view.svelte | 12 +- .../badges/ae_comp__badge_obj_li.svelte | 4 +- .../badges/ae_comp__badge_search.svelte | 12 +- .../(launcher)/launcher/+layout.svelte | 8 +- .../launcher/[event_location_id]/+page.svelte | 6 +- .../[event_id]/(launcher)/launcher_cfg.svelte | 4 +- .../(launcher)/launcher_file_cont.svelte | 12 +- .../(launcher)/launcher_menu.svelte | 6 +- .../(launcher)/launcher_presenter_view.svelte | 6 +- .../launcher_presenter_view_posters.svelte | 6 +- .../(launcher)/launcher_session_view.svelte | 6 +- .../(launcher)/menu_location_list.svelte | 6 +- .../(launcher)/menu_session_list.svelte | 6 +- src/routes/events/[event_id]/+layout.svelte | 4 +- src/routes/events/[event_id]/+page.svelte | 12 +- .../ae_comp__event_device_obj_li.svelte | 6 +- .../events/[event_id]/event_page_menu.svelte | 6 +- .../location/[event_location_id]/+page.svelte | 4 +- .../location_page_menu.svelte | 6 +- .../[event_location_id]/location_view.svelte | 6 +- .../events/[event_id]/locations/+page.svelte | 6 +- .../ae_comp__event_location_obj_li.svelte | 4 +- .../locations/locations_page_menu.svelte | 4 +- .../presenter/[presenter_id]/+page.svelte | 6 +- ...ae_comp__event_presenter_form_agree.svelte | 12 +- .../[presenter_id]/presenter_page_menu.svelte | 6 +- .../[presenter_id]/presenter_view.svelte | 6 +- .../ae_comp__event_presenter_obj_li.svelte | 6 +- .../ae_comp__event_presenter_obj_tbl.svelte | 2 +- ...mp__event_presenter_obj_tbl_wrapper.svelte | 2 +- .../events/[event_id]/reports/+page.svelte | 6 +- .../reports/event_reports_page_menu.svelte | 6 +- .../[event_id]/reports/reports_files.svelte | 6 +- .../reports/reports_presenters.svelte | 6 +- .../reports/reports_sessions.svelte | 6 +- .../session/[session_id]/+page.svelte | 6 +- ..._comp__event_session_poc_form_agree.svelte | 12 +- .../ae_comp__event_session_poc_profile.svelte | 6 +- .../[session_id]/session_page_menu.svelte | 6 +- .../session/[session_id]/session_view.svelte | 6 +- .../ae_comp__event_session_alert.svelte | 6 +- .../events/[event_id]/sign_in_out.svelte | 4 +- .../events/ae_comp__event_file_obj_tbl.svelte | 6 +- ...ae_comp__event_file_obj_tbl_wrapper.svelte | 3 +- .../events/ae_comp__event_files_upload.svelte | 12 +- .../ae_comp__event_presentation_obj_li.svelte | 5 +- .../ae_comp__event_session_obj_li.svelte | 6 +- .../ae_comp__event_session_obj_tbl.svelte | 2 +- ...comp__event_session_obj_tbl_wrapper.svelte | 2 +- .../events/ae_comp__events_menu_nav.svelte | 4 +- .../events/ae_comp__events_menu_opts.svelte | 4 +- src/routes/events_badges/+layout.svelte | 6 +- src/routes/events_badges/+page.svelte | 4 +- src/routes/events_badges/review/+layout.ts | 6 +- src/routes/events_badges/review/+page.svelte | 6 +- src/routes/events_badges/stats/+layout.ts | 6 +- src/routes/events_badges/stats/+page.svelte | 6 +- src/routes/events_leads/+layout.svelte | 4 +- src/routes/events_leads/+page.svelte | 4 +- .../events_leads/exhibit/[slug]/+page.svelte | 27 +- .../[slug]/leads_add_scan backup.svelte | 876 ------------------ .../exhibit/[slug]/leads_add_scan.svelte | 10 +- .../exhibit/[slug]/leads_list.svelte | 6 +- .../exhibit/[slug]/leads_manage.svelte | 6 +- .../exhibit/[slug]/leads_payment.svelte | 4 +- .../exhibit/[slug]/leads_view_lead.svelte | 6 +- src/routes/hosted_files/+layout.svelte | 2 +- src/routes/hosted_files/+page.svelte | 51 +- .../hosted_files/video_util/+page.svelte | 51 +- .../video_util/hold_video_util.svelte | 51 +- src/routes/idaa/(idaa)/+layout.svelte | 4 +- .../idaa/(idaa)/archives/+layout.svelte | 4 +- src/routes/idaa/(idaa)/archives/+page.svelte | 4 +- .../(idaa)/archives/[archive_id]/+page.svelte | 4 +- ...a_comp__archive_content_obj_id_edit.svelte | 14 +- ...e_idaa_comp__archive_content_obj_li.svelte | 8 +- .../ae_idaa_comp__archive_obj_id_edit.svelte | 14 +- .../ae_idaa_comp__archive_obj_id_view.svelte | 4 +- .../ae_idaa_comp__modal_media_player.svelte | 2 +- .../ae_idaa_comp__archive_obj_li.svelte | 21 +- .../ae_idaa_comp__media_player.svelte | 8 +- src/routes/idaa/(idaa)/bb/+layout.svelte | 6 +- src/routes/idaa/(idaa)/bb/+page.svelte | 4 +- .../idaa/(idaa)/bb/[post_id]/+page.svelte | 4 +- ...idaa_comp__post_comment_obj_id_edit.svelte | 12 +- .../bb/ae_idaa_comp__post_obj_id_edit.svelte | 12 +- .../bb/ae_idaa_comp__post_obj_id_view.svelte | 6 +- .../bb/ae_idaa_comp__post_obj_li.svelte | 4 +- .../bb/ae_idaa_comp__post_options.svelte | 4 +- .../(idaa)/recovery_meetings/+layout.svelte | 4 +- .../(idaa)/recovery_meetings/+page.svelte | 4 +- .../recovery_meetings/[event_id]/+page.svelte | 4 +- .../ae_idaa_comp__event_obj_id_edit.svelte | 12 +- .../ae_idaa_comp__event_obj_id_view.svelte | 4 +- .../ae_idaa_comp__event_obj_li.svelte | 4 +- .../ae_idaa_comp__event_obj_qry.svelte | 12 +- src/routes/idaa/+layout.svelte | 4 +- src/routes/journals/+layout.svelte | 6 +- src/routes/journals/+page.svelte | 2 +- .../journals/[journal_id]/+layout.svelte | 2 +- src/routes/journals/[journal_id]/+page.svelte | 2 +- .../entry/[journal_entry_id]/+page.svelte | 2 +- .../ae_comp__journal_entry_obj_file_li.svelte | 4 +- .../ae_comp__journal_entry_obj_id_view.svelte | 4 +- .../ae_comp__journal_entry_obj_li.svelte | 4 +- .../ae_comp__journal_entry_obj_qry.svelte | 2 +- .../ae_comp__journal_obj_id_edit.svelte | 4 +- .../ae_comp__journal_obj_id_view.svelte | 2 +- .../journals/ae_comp__journal_obj_li.svelte | 2 +- .../journals/ae_comp__obj_core_props.svelte | 4 +- src/routes/journals/hold+layout.svelte | 6 +- .../journals/modal_journals_config.svelte | 2 +- src/routes/testing/+page.svelte | 4 +- 225 files changed, 488 insertions(+), 1526 deletions(-) delete mode 100644 src/routes/events_leads/exhibit/[slug]/leads_add_scan backup.svelte diff --git a/src/lib/ae_api/api_get__crud_obj_id.ts b/src/lib/ae_api/api_get__crud_obj_id.ts index 46092d65..dd8da382 100644 --- a/src/lib/ae_api/api_get__crud_obj_id.ts +++ b/src/lib/ae_api/api_get__crud_obj_id.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { get_object } from './api_get_object'; // Updated 2023-12-01 diff --git a/src/lib/ae_api/api_get__crud_obj_li_v1.ts b/src/lib/ae_api/api_get__crud_obj_li_v1.ts index 68d8f8fe..f1375bf7 100644 --- a/src/lib/ae_api/api_get__crud_obj_li_v1.ts +++ b/src/lib/ae_api/api_get__crud_obj_li_v1.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { get_object } from './api_get_object'; // The lookup "obj_type" should broken out into a separate function. - 2024-08-07 diff --git a/src/lib/ae_api/api_get__crud_obj_li_v2.ts b/src/lib/ae_api/api_get__crud_obj_li_v2.ts index b92f3a57..5319c723 100644 --- a/src/lib/ae_api/api_get__crud_obj_li_v2.ts +++ b/src/lib/ae_api/api_get__crud_obj_li_v2.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { get_object } from './api_get_object'; // Refactored 2025-11-13 to use a lookup map for endpoints. diff --git a/src/lib/ae_api/api_get_object.ts b/src/lib/ae_api/api_get_object.ts index 2c3aab5f..0a6fada2 100644 --- a/src/lib/ae_api/api_get_object.ts +++ b/src/lib/ae_api/api_get_object.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; export let temp_get_blob_percent_completed = 0; export let get_blob_percent_completed = temp_get_blob_percent_completed; diff --git a/src/lib/ae_api/api_get_object_v1.ts b/src/lib/ae_api/api_get_object_v1.ts index 44b5f37f..7be7c402 100644 --- a/src/lib/ae_api/api_get_object_v1.ts +++ b/src/lib/ae_api/api_get_object_v1.ts @@ -1,6 +1,6 @@ import axios from 'axios'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; export let temp_get_blob_percent_completed = 0; // export let get_blob_percent_completed = readable(temp_get_blob_percent_completed); diff --git a/src/lib/ae_archives/ae_archives__archive.ts b/src/lib/ae_archives/ae_archives__archive.ts index 4b65d2e8..832a45ca 100644 --- a/src/lib/ae_archives/ae_archives__archive.ts +++ b/src/lib/ae_archives/ae_archives__archive.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; diff --git a/src/lib/ae_archives/ae_archives__archive_content.ts b/src/lib/ae_archives/ae_archives__archive_content.ts index b302b4bd..c2e77ae3 100644 --- a/src/lib/ae_archives/ae_archives__archive_content.ts +++ b/src/lib/ae_archives/ae_archives__archive_content.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; @@ -481,7 +481,7 @@ export async function db_save_ae_obj_li__archive_content( archive_code: obj.archive_code, archive_name: obj.archive_name, - hash_sha256: obj.hosted_file_hash_sha256 + hash_sha256: obj.hosted_file_hash_sha256 ?? '' }); // console.log(`Put obj with ID: ${obj.archive_content_id_random} or ${id_random}`); } catch (error) { diff --git a/src/lib/ae_core/ae_comp__hosted_files_clip_video.svelte b/src/lib/ae_core/ae_comp__hosted_files_clip_video.svelte index 64df9188..51d41543 100644 --- a/src/lib/ae_core/ae_comp__hosted_files_clip_video.svelte +++ b/src/lib/ae_core/ae_comp__hosted_files_clip_video.svelte @@ -6,11 +6,11 @@ import { preventDefault } from 'svelte/legacy'; // import Element_input_files_tbl from '$lib/element_input_files_tbl.svelte'; // Import storage, functions, and libraries -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { ae_util } from '$lib/ae_utils/ae_utils'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; // Exports diff --git a/src/lib/ae_core/ae_comp__hosted_files_clip_video_li.svelte b/src/lib/ae_core/ae_comp__hosted_files_clip_video_li.svelte index 676facb2..cac3bc54 100644 --- a/src/lib/ae_core/ae_comp__hosted_files_clip_video_li.svelte +++ b/src/lib/ae_core/ae_comp__hosted_files_clip_video_li.svelte @@ -4,11 +4,11 @@ // Import components and elements // Import storage, functions, and libraries -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { ae_util } from '$lib/ae_utils/ae_utils'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; // Exports diff --git a/src/lib/ae_core/ae_comp__hosted_files_clip_video_v1.svelte b/src/lib/ae_core/ae_comp__hosted_files_clip_video_v1.svelte index a60c18b8..b7755954 100644 --- a/src/lib/ae_core/ae_comp__hosted_files_clip_video_v1.svelte +++ b/src/lib/ae_core/ae_comp__hosted_files_clip_video_v1.svelte @@ -6,10 +6,10 @@ export let log_lvl: number = 0; import Element_input_files_tbl from '$lib/elements/element_input_files_tbl.svelte'; // Import storage, functions, and libraries -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; // Exports // Expecting these for link_to_type: 'event', 'event_location', 'archive_content', etc diff --git a/src/lib/ae_core/ae_comp__hosted_files_download_button.svelte b/src/lib/ae_core/ae_comp__hosted_files_download_button.svelte index 3bb81194..ff7382d7 100644 --- a/src/lib/ae_core/ae_comp__hosted_files_download_button.svelte +++ b/src/lib/ae_core/ae_comp__hosted_files_download_button.svelte @@ -23,10 +23,10 @@ // } from '@lucide/svelte'; // *** Import Aether specific variables and functions -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import { api } from '$lib/api/api'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; interface Props { log_lvl?: number; diff --git a/src/lib/ae_core/ae_comp__hosted_files_upload.svelte b/src/lib/ae_core/ae_comp__hosted_files_upload.svelte index bedea605..73d0f21c 100644 --- a/src/lib/ae_core/ae_comp__hosted_files_upload.svelte +++ b/src/lib/ae_core/ae_comp__hosted_files_upload.svelte @@ -6,10 +6,10 @@ export let log_lvl: number = 0; import Element_input_files_tbl from '$lib/elements/element_input_files_tbl.svelte'; // Import storage, functions, and libraries -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; // Exports // Expecting these for link_to_type: 'event', 'event_location', 'archive_content', etc diff --git a/src/lib/ae_core/ae_core_functions.ts b/src/lib/ae_core/ae_core_functions.ts index e9c42af0..ebade610 100644 --- a/src/lib/ae_core/ae_core_functions.ts +++ b/src/lib/ae_core/ae_core_functions.ts @@ -1,5 +1,5 @@ import { browser } from '$app/environment'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { diff --git a/src/lib/ae_core/core__activity_log.ts b/src/lib/ae_core/core__activity_log.ts index 065dc1ca..89e8bfe9 100644 --- a/src/lib/ae_core/core__activity_log.ts +++ b/src/lib/ae_core/core__activity_log.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; let ae_promises: key_val = {}; diff --git a/src/lib/ae_core/core__api_helpers.ts b/src/lib/ae_core/core__api_helpers.ts index b077bc8d..1afe1784 100644 --- a/src/lib/ae_core/core__api_helpers.ts +++ b/src/lib/ae_core/core__api_helpers.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; // Updated 2025-01-28 diff --git a/src/lib/ae_core/core__check_hosted_file_obj_w_hash.ts b/src/lib/ae_core/core__check_hosted_file_obj_w_hash.ts index 39c01f9d..20270a13 100644 --- a/src/lib/ae_core/core__check_hosted_file_obj_w_hash.ts +++ b/src/lib/ae_core/core__check_hosted_file_obj_w_hash.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; diff --git a/src/lib/ae_core/core__countries.ts b/src/lib/ae_core/core__countries.ts index c4574be5..83a7644f 100644 --- a/src/lib/ae_core/core__countries.ts +++ b/src/lib/ae_core/core__countries.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_core } from "$lib/ae_core/db_core"; diff --git a/src/lib/ae_core/core__country_subdivisions.ts b/src/lib/ae_core/core__country_subdivisions.ts index f0ffd0e3..619514b7 100644 --- a/src/lib/ae_core/core__country_subdivisions.ts +++ b/src/lib/ae_core/core__country_subdivisions.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_core } from "$lib/ae_core/db_core"; diff --git a/src/lib/ae_core/core__crud_generic.ts b/src/lib/ae_core/core__crud_generic.ts index 573b211a..91d6145b 100644 --- a/src/lib/ae_core/core__crud_generic.ts +++ b/src/lib/ae_core/core__crud_generic.ts @@ -1,6 +1,6 @@ import { marked } from 'marked'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; diff --git a/src/lib/ae_core/core__data_store.ts b/src/lib/ae_core/core__data_store.ts index dd06c310..f61ff702 100644 --- a/src/lib/ae_core/core__data_store.ts +++ b/src/lib/ae_core/core__data_store.ts @@ -1,5 +1,5 @@ import { browser } from '$app/environment'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; export interface Data_Store { diff --git a/src/lib/ae_core/core__hosted_files.ts b/src/lib/ae_core/core__hosted_files.ts index 329acca1..cce00b4d 100644 --- a/src/lib/ae_core/core__hosted_files.ts +++ b/src/lib/ae_core/core__hosted_files.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_core } from "$lib/ae_core/db_core"; diff --git a/src/lib/ae_core/core__person.ts b/src/lib/ae_core/core__person.ts index cf138a9a..290dd272 100644 --- a/src/lib/ae_core/core__person.ts +++ b/src/lib/ae_core/core__person.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; diff --git a/src/lib/ae_core/core__qr_code.ts b/src/lib/ae_core/core__qr_code.ts index a12ea119..ad45c222 100644 --- a/src/lib/ae_core/core__qr_code.ts +++ b/src/lib/ae_core/core__qr_code.ts @@ -1,6 +1,6 @@ import QRCode from 'qrcode' -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_core } from "$lib/ae_core/db_core"; diff --git a/src/lib/ae_core/core__time_zones.ts b/src/lib/ae_core/core__time_zones.ts index 7b0c2434..50e5c471 100644 --- a/src/lib/ae_core/core__time_zones.ts +++ b/src/lib/ae_core/core__time_zones.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_core } from "$lib/ae_core/db_core"; diff --git a/src/lib/ae_core/core__user.ts b/src/lib/ae_core/core__user.ts index 9a36afd2..98390878 100644 --- a/src/lib/ae_core/core__user.ts +++ b/src/lib/ae_core/core__user.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_core } from "$lib/ae_core/db_core"; diff --git a/src/lib/ae_events/ae_events__event.ts b/src/lib/ae_events/ae_events__event.ts index fe0b98f2..385d6814 100644 --- a/src/lib/ae_events/ae_events__event.ts +++ b/src/lib/ae_events/ae_events__event.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from '$lib/ae_core/core__idb_dexie'; diff --git a/src/lib/ae_events/ae_events__event_badge.ts b/src/lib/ae_events/ae_events__event_badge.ts index bb0a6618..885a5164 100644 --- a/src/lib/ae_events/ae_events__event_badge.ts +++ b/src/lib/ae_events/ae_events__event_badge.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; diff --git a/src/lib/ae_events/ae_events__event_badge_template.ts b/src/lib/ae_events/ae_events__event_badge_template.ts index dd9cfca5..70403836 100644 --- a/src/lib/ae_events/ae_events__event_badge_template.ts +++ b/src/lib/ae_events/ae_events__event_badge_template.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; import { db_events } from "$lib/ae_events/db_events"; diff --git a/src/lib/ae_events/ae_events__event_device.ts b/src/lib/ae_events/ae_events__event_device.ts index 3129f4d4..e4b79cff 100644 --- a/src/lib/ae_events/ae_events__event_device.ts +++ b/src/lib/ae_events/ae_events__event_device.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; diff --git a/src/lib/ae_events/ae_events__event_file.ts b/src/lib/ae_events/ae_events__event_file.ts index b1ef1c21..c7cc7875 100644 --- a/src/lib/ae_events/ae_events__event_file.ts +++ b/src/lib/ae_events/ae_events__event_file.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; diff --git a/src/lib/ae_events/ae_events__event_location.ts b/src/lib/ae_events/ae_events__event_location.ts index 204bdacc..b4789195 100644 --- a/src/lib/ae_events/ae_events__event_location.ts +++ b/src/lib/ae_events/ae_events__event_location.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; diff --git a/src/lib/ae_events/ae_events__event_presentation.ts b/src/lib/ae_events/ae_events__event_presentation.ts index df3257d1..05732ce5 100644 --- a/src/lib/ae_events/ae_events__event_presentation.ts +++ b/src/lib/ae_events/ae_events__event_presentation.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; diff --git a/src/lib/ae_events/ae_events__event_presenter.ts b/src/lib/ae_events/ae_events__event_presenter.ts index c94a8294..8c7382ab 100644 --- a/src/lib/ae_events/ae_events__event_presenter.ts +++ b/src/lib/ae_events/ae_events__event_presenter.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; diff --git a/src/lib/ae_events/ae_events__event_session.ts b/src/lib/ae_events/ae_events__event_session.ts index e744c363..123a706a 100644 --- a/src/lib/ae_events/ae_events__event_session.ts +++ b/src/lib/ae_events/ae_events__event_session.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; diff --git a/src/lib/ae_events/ae_events__exhibit.ts b/src/lib/ae_events/ae_events__exhibit.ts index 952321a6..74707c64 100644 --- a/src/lib/ae_events/ae_events__exhibit.ts +++ b/src/lib/ae_events/ae_events__exhibit.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_events } from "$lib/ae_events/db_events"; diff --git a/src/lib/ae_journals/ae_journals__journal.ts b/src/lib/ae_journals/ae_journals__journal.ts index 4b362c5a..4e9800d4 100644 --- a/src/lib/ae_journals/ae_journals__journal.ts +++ b/src/lib/ae_journals/ae_journals__journal.ts @@ -1,6 +1,6 @@ import { marked } from 'marked'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; diff --git a/src/lib/ae_journals/ae_journals__journal_entry.ts b/src/lib/ae_journals/ae_journals__journal_entry.ts index 7e2a667b..48274775 100644 --- a/src/lib/ae_journals/ae_journals__journal_entry.ts +++ b/src/lib/ae_journals/ae_journals__journal_entry.ts @@ -1,6 +1,6 @@ import { marked } from 'marked'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; diff --git a/src/lib/ae_journals/ae_journals_stores.ts b/src/lib/ae_journals/ae_journals_stores.ts index 6f0fb9fe..f160797f 100644 --- a/src/lib/ae_journals/ae_journals_stores.ts +++ b/src/lib/ae_journals/ae_journals_stores.ts @@ -3,7 +3,7 @@ import { persisted } from 'svelte-persisted-store'; import { writable } from 'svelte/store'; import type { Writable } from 'svelte/store'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; /* *** BEGIN *** Initialize journals_local_data_struct */ diff --git a/src/lib/ae_posts/ae_posts__post.ts b/src/lib/ae_posts/ae_posts__post.ts index f387fa85..1a24c4b4 100644 --- a/src/lib/ae_posts/ae_posts__post.ts +++ b/src/lib/ae_posts/ae_posts__post.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; diff --git a/src/lib/ae_posts/ae_posts__post_comment.ts b/src/lib/ae_posts/ae_posts__post_comment.ts index 681d3269..b99aee07 100644 --- a/src/lib/ae_posts/ae_posts__post_comment.ts +++ b/src/lib/ae_posts/ae_posts__post_comment.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_save_ae_obj_li__ae_obj } from "$lib/ae_core/core__idb_dexie"; diff --git a/src/lib/ae_sponsorships/ae_sponsorships_functions.ts b/src/lib/ae_sponsorships/ae_sponsorships_functions.ts index 7debbbd2..b08f1163 100644 --- a/src/lib/ae_sponsorships/ae_sponsorships_functions.ts +++ b/src/lib/ae_sponsorships/ae_sponsorships_functions.ts @@ -1,4 +1,4 @@ -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; import { db_sponsorships } from "$lib/ae_sponsorships/db_sponsorships"; diff --git a/src/lib/api/api.ts b/src/lib/api/api.ts index 67890506..f18fa500 100644 --- a/src/lib/api/api.ts +++ b/src/lib/api/api.ts @@ -2,13 +2,13 @@ // This is intended to be used with the Aether API. The goal is to just import all of the core functions and re-export them as a single module. This is to make it easier to import the functions into other modules. // This needs to be cleaned up and ideally removed the need for Axios. -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; -import { delete_object } from './ae_api/api_delete_object'; // Exported at the end of this file -import { get_object } from './ae_api/api_get_object'; // Exported at the end of this file -import { patch_object } from './ae_api/api_patch_object'; // Exported at the end of this file -import { post_object } from './ae_api/api_post_object'; // Exported at the end of this file +import { delete_object } from '$lib/ae_api/api_delete_object'; // Exported at the end of this file +import { get_object } from '$lib/ae_api/api_get_object'; // Exported at the end of this file +import { patch_object } from '$lib/ae_api/api_patch_object'; // Exported at the end of this file +import { post_object } from '$lib/ae_api/api_post_object'; // Exported at the end of this file import { get_ae_obj_id_crud } from '$lib/ae_api/api_get__crud_obj_id'; diff --git a/src/lib/app_components/e_app_access_type.svelte b/src/lib/app_components/e_app_access_type.svelte index cdb6c739..e7f46c18 100644 --- a/src/lib/app_components/e_app_access_type.svelte +++ b/src/lib/app_components/e_app_access_type.svelte @@ -13,10 +13,10 @@ import { // *** Import Aether specific variables and functions import { ae_util } from '$lib/ae_utils/ae_utils'; -import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/stores/ae_stores'; // import { core_func } from '$lib/ae_core/ae_core_functions'; // Ideally the Event related stores should not be imported here? -import { events_loc } from '$lib/ae_events_stores'; +import { events_loc } from '$lib/stores/ae_events_stores'; // import { db_events } from "$lib/db_events"; // export let hidden: boolean = false; diff --git a/src/lib/app_components/e_app_cfg.svelte b/src/lib/app_components/e_app_cfg.svelte index b91628d2..30d3b666 100644 --- a/src/lib/app_components/e_app_cfg.svelte +++ b/src/lib/app_components/e_app_cfg.svelte @@ -5,7 +5,7 @@ import { } from '@lucide/svelte'; import { ae_util } from '$lib/ae_utils/ae_utils'; -import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/stores/ae_stores'; // import Element_theme from '$lib/e_app_theme.svelte'; diff --git a/src/lib/app_components/e_app_debug_menu.svelte b/src/lib/app_components/e_app_debug_menu.svelte index 89fe6f90..c073074c 100644 --- a/src/lib/app_components/e_app_debug_menu.svelte +++ b/src/lib/app_components/e_app_debug_menu.svelte @@ -12,7 +12,7 @@ import { // *** Import Aether specific variables and functions // import { ae_util } from '$lib/ae_utils/ae_utils'; -import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/stores/ae_stores'; // *** Setup Svelte properties diff --git a/src/lib/app_components/e_app_help_tech.svelte b/src/lib/app_components/e_app_help_tech.svelte index 4a0cc557..9e170af4 100644 --- a/src/lib/app_components/e_app_help_tech.svelte +++ b/src/lib/app_components/e_app_help_tech.svelte @@ -59,9 +59,9 @@ import { } from '@lucide/svelte'; // *** Import Aether specific variables and functions -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger, type key_val } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger, type key_val } from '$lib/stores/ae_stores'; import { User } from 'lucide-svelte'; - import { api } from './api'; + import { api } from '$lib/api/api'; if (log_lvl) { console.log(`Help - technical support component loaded`); @@ -70,10 +70,10 @@ if (log_lvl) { let help_tech_text: string = $state(''); let hide_additional_info: boolean = $state(true); -function preventDefault(fn) { - return function (event) { +function preventDefault(fn: (event: T) => void) { + return function (event: T) { event.preventDefault(); - fn.call(this, event); + fn(event); }; } diff --git a/src/lib/app_components/e_app_sign_in_out.svelte b/src/lib/app_components/e_app_sign_in_out.svelte index 73524fd2..ff60ffd5 100644 --- a/src/lib/app_components/e_app_sign_in_out.svelte +++ b/src/lib/app_components/e_app_sign_in_out.svelte @@ -17,8 +17,8 @@ import { } from '@lucide/svelte'; // *** Import Aether specific variables and functions -import type { key_val } from '$lib/ae_stores'; -import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; +import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import { core_func } from '$lib/ae_core/ae_core_functions'; diff --git a/src/lib/app_components/e_app_sys_menu.svelte b/src/lib/app_components/e_app_sys_menu.svelte index 6a62bca5..d8a0a217 100644 --- a/src/lib/app_components/e_app_sys_menu.svelte +++ b/src/lib/app_components/e_app_sys_menu.svelte @@ -22,7 +22,7 @@ import { // *** Import Aether specific variables and functions // import { ae_util } from '$lib/ae_utils/ae_utils'; -import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/stores/ae_stores'; import Element_access_type from '$lib/app_components/e_app_access_type.svelte'; import Element_app_cfg from '$lib/app_components/e_app_cfg.svelte'; diff --git a/src/lib/app_components/e_app_theme.svelte b/src/lib/app_components/e_app_theme.svelte index 3b79fa17..918eb367 100644 --- a/src/lib/app_components/e_app_theme.svelte +++ b/src/lib/app_components/e_app_theme.svelte @@ -4,7 +4,7 @@ import { Moon, Sun } from '@lucide/svelte'; -import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/stores/ae_stores'; interface Props { log_lvl?: number; diff --git a/src/lib/components/shad-editor/custom/image-extended-component.svelte b/src/lib/components/shad-editor/custom/image-extended-component.svelte index f5d86425..072ba459 100644 --- a/src/lib/components/shad-editor/custom/image-extended-component.svelte +++ b/src/lib/components/shad-editor/custom/image-extended-component.svelte @@ -2,7 +2,7 @@ import { onDestroy, onMount } from 'svelte'; import { NodeViewWrapper } from 'svelte-tiptap'; import type { NodeViewProps } from '@tiptap/core'; - import { cn } from '$lib/utils.js'; + import { cn } from '$lib/utils/utils.js'; import { Button, buttonVariants } from '$lib/components/ui/button/index.js'; import { AlignCenter, diff --git a/src/lib/components/shad-editor/icons/block-quote.svelte b/src/lib/components/shad-editor/icons/block-quote.svelte index 6c81e40d..77046fd7 100644 --- a/src/lib/components/shad-editor/icons/block-quote.svelte +++ b/src/lib/components/shad-editor/icons/block-quote.svelte @@ -3,7 +3,7 @@ import { type Editor } from '@tiptap/core'; import * as Tooltip from '$lib/components/ui/tooltip/index.js'; import { Button } from '$lib/components/ui/button/index.js'; - import { cn } from '$lib/utils.js'; + import { cn } from '$lib/utils/utils.js'; let { editor }: { editor: Editor } = $props(); diff --git a/src/lib/components/shad-editor/icons/bold.svelte b/src/lib/components/shad-editor/icons/bold.svelte index 68f6323d..a6f32636 100644 --- a/src/lib/components/shad-editor/icons/bold.svelte +++ b/src/lib/components/shad-editor/icons/bold.svelte @@ -3,7 +3,7 @@ import { type Editor } from '@tiptap/core'; import * as Tooltip from '$lib/components/ui/tooltip/index.js'; import { Button } from '$lib/components/ui/button/index.js'; - import { cn } from '$lib/utils.js'; + import { cn } from '$lib/utils/utils.js'; let { editor }: { editor: Editor } = $props(); diff --git a/src/lib/components/shad-editor/icons/buttle-list.svelte b/src/lib/components/shad-editor/icons/buttle-list.svelte index 72887711..ade1ff65 100644 --- a/src/lib/components/shad-editor/icons/buttle-list.svelte +++ b/src/lib/components/shad-editor/icons/buttle-list.svelte @@ -3,7 +3,7 @@ import { type Editor } from '@tiptap/core'; import * as Tooltip from '$lib/components/ui/tooltip/index.js'; import { Button } from '$lib/components/ui/button/index.js'; - import { cn } from '$lib/utils.js'; + import { cn } from '$lib/utils/utils.js'; let { editor }: { editor: Editor } = $props(); diff --git a/src/lib/components/shad-editor/icons/code.svelte b/src/lib/components/shad-editor/icons/code.svelte index 1112db3b..5fc23b3b 100644 --- a/src/lib/components/shad-editor/icons/code.svelte +++ b/src/lib/components/shad-editor/icons/code.svelte @@ -3,7 +3,7 @@ import { type Editor } from '@tiptap/core'; import * as Tooltip from '$lib/components/ui/tooltip/index.js'; import { Button } from '$lib/components/ui/button/index.js'; - import { cn } from '$lib/utils.js'; + import { cn } from '$lib/utils/utils.js'; let { editor }: { editor: Editor } = $props(); diff --git a/src/lib/components/shad-editor/icons/highlighter.svelte b/src/lib/components/shad-editor/icons/highlighter.svelte index 0cdd2107..d57096c7 100644 --- a/src/lib/components/shad-editor/icons/highlighter.svelte +++ b/src/lib/components/shad-editor/icons/highlighter.svelte @@ -5,7 +5,7 @@ import { type Editor } from '@tiptap/core'; import * as Tooltip from '$lib/components/ui/tooltip/index.js'; import { Button } from '$lib/components/ui/button/index.js'; - import { cn } from '$lib/utils.js'; + import { cn } from '$lib/utils/utils.js'; import * as Popover from '$lib/components/ui/popover/index.js'; import { mode } from 'mode-watcher'; import ColorPicker from 'svelte-awesome-color-picker'; diff --git a/src/lib/components/shad-editor/icons/italic.svelte b/src/lib/components/shad-editor/icons/italic.svelte index a6676bb2..078b0fa3 100644 --- a/src/lib/components/shad-editor/icons/italic.svelte +++ b/src/lib/components/shad-editor/icons/italic.svelte @@ -3,7 +3,7 @@ import { type Editor } from '@tiptap/core'; import * as Tooltip from '$lib/components/ui/tooltip/index.js'; import { Button } from '$lib/components/ui/button/index.js'; - import { cn } from '$lib/utils.js'; + import { cn } from '$lib/utils/utils.js'; let { editor }: { editor: Editor } = $props(); diff --git a/src/lib/components/shad-editor/icons/link.svelte b/src/lib/components/shad-editor/icons/link.svelte index c8c09be6..beb2e401 100644 --- a/src/lib/components/shad-editor/icons/link.svelte +++ b/src/lib/components/shad-editor/icons/link.svelte @@ -5,7 +5,7 @@ import { type Editor } from '@tiptap/core'; import * as Tooltip from '$lib/components/ui/tooltip/index.js'; import { Button } from '$lib/components/ui/button/index.js'; - import { cn } from '$lib/utils.js'; + import { cn } from '$lib/utils/utils.js'; import * as Popover from '$lib/components/ui/popover/index.js'; import { Input } from '$lib/components/ui/input/index.js'; diff --git a/src/lib/components/shad-editor/icons/ordered-list.svelte b/src/lib/components/shad-editor/icons/ordered-list.svelte index df71ac4a..fd2dbebf 100644 --- a/src/lib/components/shad-editor/icons/ordered-list.svelte +++ b/src/lib/components/shad-editor/icons/ordered-list.svelte @@ -3,7 +3,7 @@ import { type Editor } from '@tiptap/core'; import * as Tooltip from '$lib/components/ui/tooltip/index.js'; import { Button } from '$lib/components/ui/button/index.js'; - import { cn } from '$lib/utils.js'; + import { cn } from '$lib/utils/utils.js'; let { editor }: { editor: Editor } = $props(); diff --git a/src/lib/components/shad-editor/icons/strikethrough.svelte b/src/lib/components/shad-editor/icons/strikethrough.svelte index f99f372d..5ef549b9 100644 --- a/src/lib/components/shad-editor/icons/strikethrough.svelte +++ b/src/lib/components/shad-editor/icons/strikethrough.svelte @@ -3,7 +3,7 @@ import { type Editor } from '@tiptap/core'; import * as Tooltip from '$lib/components/ui/tooltip/index.js'; import { Button } from '$lib/components/ui/button/index.js'; - import { cn } from '$lib/utils.js'; + import { cn } from '$lib/utils/utils.js'; let { editor }: { editor: Editor } = $props(); diff --git a/src/lib/components/shad-editor/icons/subscript.svelte b/src/lib/components/shad-editor/icons/subscript.svelte index 615fe843..fad10b2c 100644 --- a/src/lib/components/shad-editor/icons/subscript.svelte +++ b/src/lib/components/shad-editor/icons/subscript.svelte @@ -3,7 +3,7 @@ import { type Editor } from '@tiptap/core'; import * as Tooltip from '$lib/components/ui/tooltip/index.js'; import { Button } from '$lib/components/ui/button/index.js'; - import { cn } from '$lib/utils.js'; + import { cn } from '$lib/utils/utils.js'; let { editor }: { editor: Editor } = $props(); diff --git a/src/lib/components/shad-editor/icons/superscript.svelte b/src/lib/components/shad-editor/icons/superscript.svelte index 911c0be7..22e4d81b 100644 --- a/src/lib/components/shad-editor/icons/superscript.svelte +++ b/src/lib/components/shad-editor/icons/superscript.svelte @@ -3,7 +3,7 @@ import { type Editor } from '@tiptap/core'; import * as Tooltip from '$lib/components/ui/tooltip/index.js'; import { Button } from '$lib/components/ui/button/index.js'; - import { cn } from '$lib/utils.js'; + import { cn } from '$lib/utils/utils.js'; let { editor }: { editor: Editor } = $props(); diff --git a/src/lib/components/shad-editor/icons/task-list.svelte b/src/lib/components/shad-editor/icons/task-list.svelte index 5fbb3788..e4fd628b 100644 --- a/src/lib/components/shad-editor/icons/task-list.svelte +++ b/src/lib/components/shad-editor/icons/task-list.svelte @@ -3,7 +3,7 @@ import { type Editor } from '@tiptap/core'; import * as Tooltip from '$lib/components/ui/tooltip/index.js'; import { Button } from '$lib/components/ui/button/index.js'; - import { cn } from '$lib/utils.js'; + import { cn } from '$lib/utils/utils.js'; let { editor }: { editor: Editor } = $props(); diff --git a/src/lib/components/shad-editor/icons/textcolor.svelte b/src/lib/components/shad-editor/icons/textcolor.svelte index 68dfe67a..b3dda101 100644 --- a/src/lib/components/shad-editor/icons/textcolor.svelte +++ b/src/lib/components/shad-editor/icons/textcolor.svelte @@ -5,7 +5,7 @@ import { type Editor } from '@tiptap/core'; import * as Tooltip from '$lib/components/ui/tooltip/index.js'; import { Button } from '$lib/components/ui/button/index.js'; - import { cn } from '$lib/utils.js'; + import { cn } from '$lib/utils/utils.js'; import * as Popover from '$lib/components/ui/popover/index.js'; import { mode } from 'mode-watcher'; import ColorPicker from 'svelte-awesome-color-picker'; diff --git a/src/lib/components/shad-editor/icons/underline.svelte b/src/lib/components/shad-editor/icons/underline.svelte index ff22a073..00c03f67 100644 --- a/src/lib/components/shad-editor/icons/underline.svelte +++ b/src/lib/components/shad-editor/icons/underline.svelte @@ -3,7 +3,7 @@ import { type Editor } from '@tiptap/core'; import * as Tooltip from '$lib/components/ui/tooltip/index.js'; import { Button } from '$lib/components/ui/button/index.js'; - import { cn } from '$lib/utils.js'; + import { cn } from '$lib/utils/utils.js'; let { editor }: { editor: Editor } = $props(); diff --git a/src/lib/components/shad-editor/shad-editor.svelte b/src/lib/components/shad-editor/shad-editor.svelte index 712a4718..2030f5cd 100644 --- a/src/lib/components/shad-editor/shad-editor.svelte +++ b/src/lib/components/shad-editor/shad-editor.svelte @@ -5,7 +5,7 @@ import { Editor, type Content } from '@tiptap/core'; import StarterKit from '@tiptap/starter-kit'; import { onDestroy, onMount } from 'svelte'; import EditorToolbar from './editor-toolbar.svelte'; -import { cn } from '$lib/utils.js'; +import { cn } from '$lib/utils/utils.js'; import { Subscript } from '@tiptap/extension-subscript'; import { Superscript } from '@tiptap/extension-superscript'; diff --git a/src/lib/components/ui/button/button.svelte b/src/lib/components/ui/button/button.svelte index 16539fdf..2ab7c751 100644 --- a/src/lib/components/ui/button/button.svelte +++ b/src/lib/components/ui/button/button.svelte @@ -39,7 +39,7 @@ diff --git a/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte b/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte index 8f2c34cb..0e04f33b 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher_file_cont.svelte @@ -59,12 +59,12 @@ import { fade, scale, fly } from 'svelte/transition'; // *** Import other supporting libraries // *** Import Aether specific variables and functions -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import { api } from '$lib/api/api'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; import { core_func } from '$lib/ae_core/ae_core_functions'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Element_ae_crud from '$lib/elements/element_ae_crud.svelte'; @@ -259,10 +259,10 @@ async function handle_open_file() { // $events_loc.launcher.modal_title = modal_title; // } -function preventDefault(fn) { - return function (event) { +function preventDefault(fn: (event: T) => void) { + return function (event: T) { event.preventDefault(); - fn.call(this, event); + fn(event); }; } diff --git a/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte b/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte index 6898d659..58b16e1c 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher_menu.svelte @@ -62,7 +62,7 @@ let { // import { liveQuery } from "dexie"; // *** Import Aether specific variables and functions -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import { api } from '$lib/api/api'; // import Element_ae_crud from '$lib/element_ae_crud.svelte'; @@ -70,9 +70,9 @@ import { api } from '$lib/api/api'; // import { core_func } from '$lib/ae_core_functions'; // import { db_core } from "$lib/db_core"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; // import { db_events } from "$lib/ae_events/db_events"; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Event_launcher_file_cont from './launcher_file_cont.svelte'; diff --git a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte index b991f7e4..d980cca1 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view.svelte @@ -6,15 +6,15 @@ interface Props { let { lq__event_presenter_obj }: Props = $props(); -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; // import { ae_util } from '$lib/ae_utils/ae_utils'; // import { api } from '$lib/api'; import { liveQuery } from "dexie"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; import { db_events } from "$lib/ae_events/db_events"; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; // import { events_func } from '$lib/ae_events_functions'; import Event_launcher_file_cont from './launcher_file_cont.svelte'; diff --git a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte index a3b8ede9..c3b6250c 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher_presenter_view_posters.svelte @@ -10,15 +10,15 @@ let { hide_name = false }: Props = $props(); -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; // import { ae_util } from '$lib/ae_utils/ae_utils'; // import { api } from '$lib/api'; import { liveQuery } from "dexie"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; import { db_events } from "$lib/ae_events/db_events"; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; // import { events_func } from '$lib/ae_events_functions'; import Event_launcher_file_cont from './launcher_file_cont.svelte'; diff --git a/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte b/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte index 8b867edc..bb731f34 100644 --- a/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte +++ b/src/routes/events/[event_id]/(launcher)/launcher_session_view.svelte @@ -13,7 +13,7 @@ let { log_lvl = $bindable(1), }: Props = $props(); -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; // import Element_ae_crud from '$lib/element_ae_crud.svelte'; @@ -24,9 +24,9 @@ import Launcher_presenter_view_posters from './launcher_presenter_view_posters.s import { liveQuery } from "dexie"; // import { core_func } from '$lib/ae_core_functions'; // import { db_core } from "$lib/db_core"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; import { db_events } from "$lib/ae_events/db_events"; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; diff --git a/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte b/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte index 391de5af..4acd1e1d 100644 --- a/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte +++ b/src/routes/events/[event_id]/(launcher)/menu_location_list.svelte @@ -31,11 +31,11 @@ import { goto } from '$app/navigation'; // *** Import other supporting libraries // *** Import Aether specific variables and functions -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; // import { db_events } from "$lib/db_events"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; // export let slct_event_session_id: any; diff --git a/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte b/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte index 36165194..7369c54f 100644 --- a/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte +++ b/src/routes/events/[event_id]/(launcher)/menu_session_list.svelte @@ -31,11 +31,11 @@ import { goto } from '$app/navigation'; // *** Import other supporting libraries // *** Import Aether specific variables and functions -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; // import { db_events } from "$lib/db_events"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; // export let slct__event_session_id: any; diff --git a/src/routes/events/[event_id]/+layout.svelte b/src/routes/events/[event_id]/+layout.svelte index 05f59331..3329e8f3 100644 --- a/src/routes/events/[event_id]/+layout.svelte +++ b/src/routes/events/[event_id]/+layout.svelte @@ -20,8 +20,8 @@ let log_lvl: number = 0; // import { liveQuery } from "dexie"; // import { core_func } from '$lib/ae_core_functions'; // import { db_events } from "$lib/db_events"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; // import { events_func } from '$lib/ae_events_functions'; diff --git a/src/routes/events/[event_id]/+page.svelte b/src/routes/events/[event_id]/+page.svelte index a1ac93f0..b1703d50 100644 --- a/src/routes/events/[event_id]/+page.svelte +++ b/src/routes/events/[event_id]/+page.svelte @@ -14,7 +14,7 @@ let { import { browser } from '$app/environment'; // import { goto, invalidate, pushState, replaceState } from '$app/navigation'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; // import Element_data_store from '$lib/element_data_store_v2.svelte'; // import Comp_event_session_obj_li from '../ae_comp__event_session_obj_li.svelte'; @@ -23,8 +23,8 @@ import Comp_event_session_obj_li_wrapper from '../ae_comp__event_session_obj_li_ import { liveQuery } from "dexie"; // import { core_func } from '$lib/ae_core_functions'; import { db_events } from "$lib/ae_events/db_events"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Comp_event_files_upload from '../ae_comp__event_files_upload.svelte'; @@ -136,10 +136,10 @@ if (browser) { $events_trigger = 'load__event_session_obj_li'; } -function preventDefault(fn) { - return function (event) { +function preventDefault(fn: (event: T) => void) { + return function (event: T) { event.preventDefault(); - fn.call(this, event); + fn(event); }; } diff --git a/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte b/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte index 3b495d8c..2f153653 100644 --- a/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte +++ b/src/routes/events/[event_id]/device/ae_comp__event_device_obj_li.svelte @@ -20,10 +20,10 @@ let { // Imports import { onDestroy } from 'svelte'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Element_ae_crud from '$lib/elements/element_ae_crud.svelte'; diff --git a/src/routes/events/[event_id]/event_page_menu.svelte b/src/routes/events/[event_id]/event_page_menu.svelte index e85ba037..0e15ea64 100644 --- a/src/routes/events/[event_id]/event_page_menu.svelte +++ b/src/routes/events/[event_id]/event_page_menu.svelte @@ -12,10 +12,10 @@ let { import { goto } from '$app/navigation'; -import type { key_val } from '$lib/ae_stores'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; import { core_func } from '$lib/ae_core/ae_core_functions'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Element_ae_crud from '$lib/elements/element_ae_crud.svelte'; diff --git a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte index 276fcc96..189812d5 100644 --- a/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte +++ b/src/routes/events/[event_id]/location/[event_location_id]/+page.svelte @@ -21,8 +21,8 @@ import { ae_util } from '$lib/ae_utils/ae_utils'; import { liveQuery } from "dexie"; // import { core_func } from '$lib/ae_core_functions'; import { db_events } from "$lib/ae_events/db_events"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; // import { events_func } from '$lib/ae_events_functions'; import Comp_event_files_upload from '../../../ae_comp__event_files_upload.svelte'; diff --git a/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte b/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte index deb1ee69..e948becc 100644 --- a/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte +++ b/src/routes/events/[event_id]/location/[event_location_id]/location_page_menu.svelte @@ -9,9 +9,9 @@ interface Props { let { log_lvl = 0, lq__event_obj, lq__event_location_obj }: Props = $props(); -import type { key_val } from '$lib/ae_stores'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import type { key_val } from '$lib/stores/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Element_ae_crud from '$lib/elements/element_ae_crud.svelte'; diff --git a/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte b/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte index 16fc9220..d1ef5892 100644 --- a/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte +++ b/src/routes/events/[event_id]/location/[event_location_id]/location_view.svelte @@ -19,7 +19,7 @@ import { liveQuery } from "dexie"; // const dispatch = createEventDispatcher(); -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import Element_ae_crud from '$lib/elements/element_ae_crud.svelte'; import Element_data_store from '$lib/elements/element_data_store_v2.svelte'; @@ -30,8 +30,8 @@ let ae_promises: key_val = $state({}); import { core_func } from '$lib/ae_core/ae_core_functions'; import { db_events } from "$lib/ae_events/db_events"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; // Exports diff --git a/src/routes/events/[event_id]/locations/+page.svelte b/src/routes/events/[event_id]/locations/+page.svelte index e5dbeb2a..037628ac 100644 --- a/src/routes/events/[event_id]/locations/+page.svelte +++ b/src/routes/events/[event_id]/locations/+page.svelte @@ -12,7 +12,7 @@ let log_lvl: number = 0; // Imports import { onMount } from 'svelte'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import Element_data_store from '$lib/elements/element_data_store_v2.svelte'; @@ -23,8 +23,8 @@ let ae_triggers: key_val = {}; import { liveQuery } from "dexie"; import { core_func } from '$lib/ae_core/ae_core_functions'; import { db_events } from "$lib/ae_events/db_events"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Comp_event_location_obj_li from './ae_comp__event_location_obj_li.svelte'; diff --git a/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte b/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte index 504aa487..e6a8d3e2 100644 --- a/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte +++ b/src/routes/events/[event_id]/locations/ae_comp__event_location_obj_li.svelte @@ -17,8 +17,8 @@ let { }: Props = $props(); // Imports -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Comp_event_session_obj_li from '../../ae_comp__event_session_obj_li_wrapper.svelte'; diff --git a/src/routes/events/[event_id]/locations/locations_page_menu.svelte b/src/routes/events/[event_id]/locations/locations_page_menu.svelte index 6547abfd..076e9ad0 100644 --- a/src/routes/events/[event_id]/locations/locations_page_menu.svelte +++ b/src/routes/events/[event_id]/locations/locations_page_menu.svelte @@ -9,8 +9,8 @@ interface Props { let { log_lvl = 0, lq__event_obj }: Props = $props(); // import type { key_val } from '$lib/ae_stores'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; // import { events_func } from '$lib/ae_events_functions'; // import Element_ae_crud from '$lib/element_ae_crud.svelte'; diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte index 9dc4c37a..cc466b1e 100644 --- a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte +++ b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte @@ -9,7 +9,7 @@ let { data, log_lvl = 0 }: Props = $props(); // Imports (external and then internal) import { browser } from '$app/environment'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import Element_data_store from '$lib/elements/element_data_store_v2.svelte'; @@ -17,8 +17,8 @@ import { liveQuery } from "dexie"; import { Modal } from 'flowbite-svelte'; // import { core_func } from '$lib/ae_core_functions'; import { db_events } from "$lib/ae_events/db_events"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Comp_event_files_upload from '../../../ae_comp__event_files_upload.svelte'; diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte index 913de9ab..1ff92256 100644 --- a/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte +++ b/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte @@ -14,15 +14,15 @@ console.log(`ae_events_pres_mgmt session [slug] form_agree.svelte`); // import { onMount } from 'svelte'; // import { liveQuery } from "dexie"; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import { api } from '$lib/api/api'; import Element_data_store from '$lib/elements/element_data_store_v2.svelte'; // import Element_ae_crud from '$lib/element_ae_crud.svelte'; -import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; // import { db_events } from "$lib/db_events"; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; @@ -41,10 +41,10 @@ let tmp_opt_out: key_val = { }; // *** Functions and Logic -function preventDefault(fn) { - return function (event) { +function preventDefault(fn: (event: T) => void) { + return function (event: T) { event.preventDefault(); - fn.call(this, event); + fn(event); }; } diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte index 2347a4d8..f5cc4c09 100644 --- a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte +++ b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte @@ -11,9 +11,9 @@ let { log_lvl = 0, lq__event_obj, lq__event_presenter_obj }: Props = $props(); import { goto } from '$app/navigation'; -import type { key_val } from '$lib/ae_stores'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import type { key_val } from '$lib/stores/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Element_ae_crud from '$lib/elements/element_ae_crud.svelte'; diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte index c2511f5c..d0ccfc5c 100644 --- a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte +++ b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte @@ -15,7 +15,7 @@ import { onMount } from 'svelte'; // import { liveQuery } from "dexie"; import { browser } from '$app/environment'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; // import { api } from '$lib/api'; import Element_ae_crud from '$lib/elements/element_ae_crud.svelte'; @@ -23,9 +23,9 @@ import Element_ae_crud from '$lib/elements/element_ae_crud.svelte'; import MyClipboard from '$lib/app_components/e_app_clipboard.svelte'; import { core_func } from '$lib/ae_core/ae_core_functions'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; // import { db_events } from "$lib/ae_events/db_events"; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; // Exports diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li.svelte index 30bdc501..844b6559 100644 --- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li.svelte +++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_li.svelte @@ -18,7 +18,7 @@ let { }: Props = $props(); // Imports -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; // import { ae_util } from '$lib/ae_utils/ae_utils'; // import { api, send_email } from '$lib/api'; // import Element_ae_crud from '$lib/element_ae_crud.svelte'; @@ -27,8 +27,8 @@ import type { key_val } from '$lib/ae_stores'; // import { liveQuery } from "dexie"; import { core_func } from '$lib/ae_core/ae_core_functions'; // import { db_events } from "$lib/ae_events/db_events"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import { ae_util } from '$lib/ae_utils/ae_utils'; diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte index c9faf9f4..9bd283bf 100644 --- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte +++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl.svelte @@ -23,7 +23,7 @@ let { // Imports import { ae_util } from '$lib/ae_utils/ae_utils'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; // export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher' // export let link_to_type: string; diff --git a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte index 1c75485e..ef8a7a46 100644 --- a/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte +++ b/src/routes/events/[event_id]/presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte @@ -32,7 +32,7 @@ let { import Comp_event_presenter_obj_tbl from './ae_comp__event_presenter_obj_tbl.svelte'; import { liveQuery } from "dexie"; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { db_events } from "$lib/ae_events/db_events"; if (log_lvl) { diff --git a/src/routes/events/[event_id]/reports/+page.svelte b/src/routes/events/[event_id]/reports/+page.svelte index a133df0c..1e1d9b9b 100644 --- a/src/routes/events/[event_id]/reports/+page.svelte +++ b/src/routes/events/[event_id]/reports/+page.svelte @@ -10,14 +10,14 @@ let log_lvl: number = $state(0); import { page } from '$app/stores'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import { liveQuery } from "dexie"; // import { core_func } from '$lib/ae_core_functions'; import { db_events } from "$lib/ae_events/db_events"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Event_reports_page_menu from './event_reports_page_menu.svelte'; diff --git a/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte b/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte index cfa138c2..7d766a19 100644 --- a/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte +++ b/src/routes/events/[event_id]/reports/event_reports_page_menu.svelte @@ -6,9 +6,9 @@ interface Props { let { data, lq__event_obj }: Props = $props(); -import type { key_val } from '$lib/ae_stores'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import type { key_val } from '$lib/stores/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; // import { events_func } from '$lib/ae_events_functions'; // import Element_ae_crud from '$lib/element_ae_crud.svelte'; diff --git a/src/routes/events/[event_id]/reports/reports_files.svelte b/src/routes/events/[event_id]/reports/reports_files.svelte index d78a35c8..ea4378fb 100644 --- a/src/routes/events/[event_id]/reports/reports_files.svelte +++ b/src/routes/events/[event_id]/reports/reports_files.svelte @@ -51,11 +51,11 @@ let { // *** Import other supporting libraries // *** Import Aether specific variables and functions -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; // import { ae_util } from '$lib/ae_utils/ae_utils'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; // import { db_events } from "$lib/ae_events/db_events"; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Comp_event_file_obj_tbl from './../../ae_comp__event_file_obj_tbl_wrapper.svelte'; diff --git a/src/routes/events/[event_id]/reports/reports_presenters.svelte b/src/routes/events/[event_id]/reports/reports_presenters.svelte index fad93c13..75e56026 100644 --- a/src/routes/events/[event_id]/reports/reports_presenters.svelte +++ b/src/routes/events/[event_id]/reports/reports_presenters.svelte @@ -50,11 +50,11 @@ let { // *** Import other supporting libraries // *** Import Aether specific variables and functions -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; // import { ae_util } from '$lib/ae_utils/ae_utils'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; // import { db_events } from "$lib/ae_events/db_events"; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Comp_event_presenter_obj_tbl from './../presenter/ae_comp__event_presenter_obj_tbl_wrapper.svelte'; diff --git a/src/routes/events/[event_id]/reports/reports_sessions.svelte b/src/routes/events/[event_id]/reports/reports_sessions.svelte index f1d7e32f..f0c3ab9e 100644 --- a/src/routes/events/[event_id]/reports/reports_sessions.svelte +++ b/src/routes/events/[event_id]/reports/reports_sessions.svelte @@ -50,11 +50,11 @@ let { // *** Import other supporting libraries // *** Import Aether specific variables and functions -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; // import { ae_util } from '$lib/ae_utils/ae_utils'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; // import { db_events } from "$lib/ae_events/db_events"; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Comp_event_session_obj_tbl from '../../ae_comp__event_session_obj_tbl_wrapper.svelte'; diff --git a/src/routes/events/[event_id]/session/[session_id]/+page.svelte b/src/routes/events/[event_id]/session/[session_id]/+page.svelte index 3ee6af18..af66098a 100644 --- a/src/routes/events/[event_id]/session/[session_id]/+page.svelte +++ b/src/routes/events/[event_id]/session/[session_id]/+page.svelte @@ -12,7 +12,7 @@ let log_lvl: number = $state(0); // Imports import { Modal } from 'flowbite-svelte'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import Element_data_store from '$lib/elements/element_data_store_v2.svelte'; @@ -23,8 +23,8 @@ let ae_triggers: key_val = {}; import { liveQuery } from "dexie"; import { core_func } from '$lib/ae_core/ae_core_functions'; import { db_events } from "$lib/ae_events/db_events"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Comp_event_files_upload from '../../../ae_comp__event_files_upload.svelte'; diff --git a/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte b/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte index 117cdac7..40e89bb6 100644 --- a/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte +++ b/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_form_agree.svelte @@ -10,10 +10,10 @@ let { log_lvl = 0, lq__event_session_obj }: Props = $props(); console.log(`ae_events_pres_mgmt session [slug] form_agree.svelte`); // Imports (external and then internal) -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; -import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; // Import components and elements @@ -39,10 +39,10 @@ let tmp_opt_out: key_val = { }; // *** Functions and Logic -function preventDefault(fn) { - return function (event) { +function preventDefault(fn: (event: T) => void) { + return function (event: T) { event.preventDefault(); - fn.call(this, event); + fn(event); }; } diff --git a/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_profile.svelte b/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_profile.svelte index 97255d9a..3da92ff8 100644 --- a/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_profile.svelte +++ b/src/routes/events/[event_id]/session/[session_id]/ae_comp__event_session_poc_profile.svelte @@ -13,11 +13,11 @@ import { ae_util } from '$lib/ae_utils/ae_utils'; // import Element_input_files_tbl from '$lib/element_input_files_tbl.svelte'; // Import storage, functions, and libraries -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; // import { api } from '$lib/api'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; // import { db_events } from "$lib/db_events"; import MyClipboard from '$lib/app_components/e_app_clipboard.svelte'; diff --git a/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte b/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte index 068c0724..322faec5 100644 --- a/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte +++ b/src/routes/events/[event_id]/session/[session_id]/session_page_menu.svelte @@ -16,10 +16,10 @@ let { import { goto } from '$app/navigation'; -import type { key_val } from '$lib/ae_stores'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; import { core_func } from '$lib/ae_core/ae_core_functions'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Element_ae_crud from '$lib/elements/element_ae_crud.svelte'; diff --git a/src/routes/events/[event_id]/session/[session_id]/session_view.svelte b/src/routes/events/[event_id]/session/[session_id]/session_view.svelte index 4fde2eea..adf0dfcb 100644 --- a/src/routes/events/[event_id]/session/[session_id]/session_view.svelte +++ b/src/routes/events/[event_id]/session/[session_id]/session_view.svelte @@ -28,7 +28,7 @@ import { Modal } from 'flowbite-svelte'; // const dispatch = createEventDispatcher(); -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import Element_ae_crud from '$lib/elements/element_ae_crud.svelte'; // import Element_data_store from '$lib/element_data_store_v2.svelte'; @@ -40,8 +40,8 @@ let ae_triggers: key_val = {}; import { core_func } from '$lib/ae_core/ae_core_functions'; // import { db_events } from "$lib/ae_events/db_events"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; // import Comp_event_presenter_form_agree from './ae_comp__event_presenter_form_agree.svelte'; diff --git a/src/routes/events/[event_id]/session/ae_comp__event_session_alert.svelte b/src/routes/events/[event_id]/session/ae_comp__event_session_alert.svelte index 3d032d80..c0710003 100644 --- a/src/routes/events/[event_id]/session/ae_comp__event_session_alert.svelte +++ b/src/routes/events/[event_id]/session/ae_comp__event_session_alert.svelte @@ -36,13 +36,13 @@ let { // *** Import Svelte specific -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { core_func } from '$lib/ae_core/ae_core_functions'; // *** Import Aether specific variables and functions // import Element_ae_crud_v2 from '$lib/element_ae_crud_v2.svelte'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; // Variables diff --git a/src/routes/events/[event_id]/sign_in_out.svelte b/src/routes/events/[event_id]/sign_in_out.svelte index 5333d094..258fa81e 100644 --- a/src/routes/events/[event_id]/sign_in_out.svelte +++ b/src/routes/events/[event_id]/sign_in_out.svelte @@ -17,8 +17,8 @@ let { import { browser } from '$app/environment'; import { goto } from '$app/navigation'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; if (browser) { console.log('Browser environment detected.'); diff --git a/src/routes/events/ae_comp__event_file_obj_tbl.svelte b/src/routes/events/ae_comp__event_file_obj_tbl.svelte index 9fd42c82..3d5b50e4 100644 --- a/src/routes/events/ae_comp__event_file_obj_tbl.svelte +++ b/src/routes/events/ae_comp__event_file_obj_tbl.svelte @@ -33,13 +33,13 @@ let { // Imports import { liveQuery } from "dexie"; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import { api } from '$lib/api/api'; import { db_events } from "$lib/ae_events/db_events"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -// import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +// import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; // import { events_func } from '$lib/ae_events_functions'; import MyClipboard from '$lib/app_components/e_app_clipboard.svelte'; diff --git a/src/routes/events/ae_comp__event_file_obj_tbl_wrapper.svelte b/src/routes/events/ae_comp__event_file_obj_tbl_wrapper.svelte index 00cdaa5d..147bbfbd 100644 --- a/src/routes/events/ae_comp__event_file_obj_tbl_wrapper.svelte +++ b/src/routes/events/ae_comp__event_file_obj_tbl_wrapper.svelte @@ -37,9 +37,8 @@ let { import Comp_event_file_obj_tbl from './ae_comp__event_file_obj_tbl.svelte'; import { liveQuery } from "dexie"; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { db_events } from "$lib/ae_events/db_events"; - import { all } from 'axios'; if (log_lvl) { console.log(`link_to_type: ${link_to_type}; link_to_id: ${link_to_id}`); diff --git a/src/routes/events/ae_comp__event_files_upload.svelte b/src/routes/events/ae_comp__event_files_upload.svelte index bef496d4..12e8727e 100644 --- a/src/routes/events/ae_comp__event_files_upload.svelte +++ b/src/routes/events/ae_comp__event_files_upload.svelte @@ -39,11 +39,11 @@ let { import Element_input_files_tbl from '$lib/elements/element_input_files_tbl.svelte'; // Import storage, functions, and libraries -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { api } from '$lib/api/api'; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import { db_events } from "$lib/ae_events/db_events"; @@ -59,10 +59,10 @@ let input_element_id = 'ae_comp__event_files_upload__input'; // *** Functions and Logic -function preventDefault(fn) { - return function (event) { +function preventDefault(fn: (event: T) => void) { + return function (event: T) { event.preventDefault(); - fn.call(this, event); + fn(event); }; } diff --git a/src/routes/events/ae_comp__event_presentation_obj_li.svelte b/src/routes/events/ae_comp__event_presentation_obj_li.svelte index b3c76ba8..8c0ebd6a 100644 --- a/src/routes/events/ae_comp__event_presentation_obj_li.svelte +++ b/src/routes/events/ae_comp__event_presentation_obj_li.svelte @@ -22,8 +22,9 @@ import { ae_util } from '$lib/ae_utils/ae_utils'; // import { liveQuery } from "dexie"; // import { core_func } from '$lib/ae_core_functions'; // import { db_events } from "$lib/db_events"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_func } from '$lib/ae_events_functions'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; import Element_ae_crud from '$lib/elements/element_ae_crud.svelte'; import Comp_event_presenter_obj_li from '../events/[event_id]/presenter/ae_comp__event_presenter_obj_li_wrapper.svelte'; import Element_manage_event_file_li_wrap from '$lib/elements/element_manage_event_file_li_all.svelte'; diff --git a/src/routes/events/ae_comp__event_session_obj_li.svelte b/src/routes/events/ae_comp__event_session_obj_li.svelte index c352e999..c9c2b51b 100644 --- a/src/routes/events/ae_comp__event_session_obj_li.svelte +++ b/src/routes/events/ae_comp__event_session_obj_li.svelte @@ -36,7 +36,7 @@ let { // *** Import Svelte specific // *** Import Aether specific variables and functions -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import Element_ae_crud_v2 from '$lib/elements/element_ae_crud_v2.svelte'; // import Element_data_store from '$lib/element_data_store_v2.svelte'; @@ -47,8 +47,8 @@ import Comp_event_session_alert from '../events/[event_id]/session/ae_comp__even import { core_func } from '$lib/ae_core/ae_core_functions'; // import { db_events } from "$lib/db_events"; -import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; // export let allow_basic: boolean = false; diff --git a/src/routes/events/ae_comp__event_session_obj_tbl.svelte b/src/routes/events/ae_comp__event_session_obj_tbl.svelte index 79da076e..de26097b 100644 --- a/src/routes/events/ae_comp__event_session_obj_tbl.svelte +++ b/src/routes/events/ae_comp__event_session_obj_tbl.svelte @@ -22,7 +22,7 @@ let { // import { liveQuery } from "dexie"; import { ae_util } from '$lib/ae_utils/ae_utils'; // Imports - events specific -// import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/ae_events_stores'; +// import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv } from '$lib/stores/ae_events_stores'; // import { db_events } from "$lib/db_events"; diff --git a/src/routes/events/ae_comp__event_session_obj_tbl_wrapper.svelte b/src/routes/events/ae_comp__event_session_obj_tbl_wrapper.svelte index e9e849a8..349d3d37 100644 --- a/src/routes/events/ae_comp__event_session_obj_tbl_wrapper.svelte +++ b/src/routes/events/ae_comp__event_session_obj_tbl_wrapper.svelte @@ -29,7 +29,7 @@ let { import Comp_event_session_obj_tbl from './ae_comp__event_session_obj_tbl.svelte'; import { liveQuery } from "dexie"; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { db_events } from "$lib/ae_events/db_events"; if (log_lvl) { diff --git a/src/routes/events/ae_comp__events_menu_nav.svelte b/src/routes/events/ae_comp__events_menu_nav.svelte index 3aa57580..887d39a2 100644 --- a/src/routes/events/ae_comp__events_menu_nav.svelte +++ b/src/routes/events/ae_comp__events_menu_nav.svelte @@ -1,6 +1,6 @@ diff --git a/src/routes/events_badges/+layout.svelte b/src/routes/events_badges/+layout.svelte index 68d9325d..62e89f3e 100644 --- a/src/routes/events_badges/+layout.svelte +++ b/src/routes/events_badges/+layout.svelte @@ -5,11 +5,11 @@ export let data: any; import { goto } from '$app/navigation'; import { onMount } from 'svelte'; import type { Writable } from 'svelte/store'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; // import { ae_util } from '$lib/ae_utils/ae_utils'; import { api } from '$lib/api/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 { ae_loc, ae_sess, ae_api, slct } from '$lib/stores/ae_stores'; +import { events_loc, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; // import Element_data_store from '$lib/element_data_store_v2.svelte'; diff --git a/src/routes/events_badges/+page.svelte b/src/routes/events_badges/+page.svelte index f7c3a24a..6493225d 100644 --- a/src/routes/events_badges/+page.svelte +++ b/src/routes/events_badges/+page.svelte @@ -6,8 +6,8 @@ console.log(`ae_events_badges +page data:`, data); import { onMount } from 'svelte'; import { api } from '$lib/api/api'; -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_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import Element_data_store from '$lib/elements/element_data_store_v2.svelte'; diff --git a/src/routes/events_badges/review/+layout.ts b/src/routes/events_badges/review/+layout.ts index 5ee1c077..2ea194f4 100644 --- a/src/routes/events_badges/review/+layout.ts +++ b/src/routes/events_badges/review/+layout.ts @@ -2,11 +2,11 @@ import { get } from 'svelte/store'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; // import { ae_util } from '$lib/ae_utils/ae_utils'; // import { api } from '$lib/api'; -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_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/stores/ae_stores'; +// import { events_loc, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; export async function load({ params, parent, url }) { // route diff --git a/src/routes/events_badges/review/+page.svelte b/src/routes/events_badges/review/+page.svelte index 4898880a..bb61b5b9 100644 --- a/src/routes/events_badges/review/+page.svelte +++ b/src/routes/events_badges/review/+page.svelte @@ -5,14 +5,14 @@ console.log(`ae_events_badges [slug] +page data:`, data); import { onMount } from 'svelte'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import { api } from '$lib/api/api'; import { events_func } from '$lib/ae_events_functions'; import { liveQuery } from "dexie"; import { db_events } from "$lib/ae_events/db_events"; -import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import Element_qr_scanner from '$lib/elements/element_qr_scanner.svelte'; import Element_ae_crud from '$lib/elements/element_ae_crud.svelte'; diff --git a/src/routes/events_badges/stats/+layout.ts b/src/routes/events_badges/stats/+layout.ts index 6d3ae0e6..aeae2f39 100644 --- a/src/routes/events_badges/stats/+layout.ts +++ b/src/routes/events_badges/stats/+layout.ts @@ -2,11 +2,11 @@ import { get } from 'svelte/store'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; // import { ae_util } from '$lib/ae_utils/ae_utils'; // import { api } from '$lib/api'; -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_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/stores/ae_stores'; +// import { events_loc, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; /* diff --git a/src/routes/events_badges/stats/+page.svelte b/src/routes/events_badges/stats/+page.svelte index c9dcadba..49a80ad5 100644 --- a/src/routes/events_badges/stats/+page.svelte +++ b/src/routes/events_badges/stats/+page.svelte @@ -12,14 +12,14 @@ console.log(`ae_events_badges stats +page.svelte data:`, data); import { onMount } from 'svelte'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import { api } from '$lib/api/api'; import { events_func } from '$lib/ae_events_functions'; import { liveQuery } from "dexie"; import { db_events } from "$lib/ae_events/db_events"; -import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import Element_qr_scanner from '$lib/elements/element_qr_scanner.svelte'; import Element_ae_crud from '$lib/elements/element_ae_crud.svelte'; diff --git a/src/routes/events_leads/+layout.svelte b/src/routes/events_leads/+layout.svelte index bfca87bc..74d989fc 100644 --- a/src/routes/events_leads/+layout.svelte +++ b/src/routes/events_leads/+layout.svelte @@ -7,8 +7,8 @@ import { onMount } from 'svelte'; // import type { key_val } from '$lib/ae_stores'; // import { ae_util } from '$lib/ae_utils/ae_utils'; -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_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; $events_loc.qry__enabled = 'enabled'; diff --git a/src/routes/events_leads/+page.svelte b/src/routes/events_leads/+page.svelte index bfd78d88..357a2495 100644 --- a/src/routes/events_leads/+page.svelte +++ b/src/routes/events_leads/+page.svelte @@ -10,8 +10,8 @@ import { ae_util } from '$lib/ae_utils/ae_utils'; import { api } from '$lib/api/api'; import { liveQuery } from "dexie"; import { db_events } from "$lib/ae_events/db_events"; -import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import Element_data_store from '$lib/elements/element_data_store_v2.svelte'; diff --git a/src/routes/events_leads/exhibit/[slug]/+page.svelte b/src/routes/events_leads/exhibit/[slug]/+page.svelte index 85fcc689..0df6889e 100644 --- a/src/routes/events_leads/exhibit/[slug]/+page.svelte +++ b/src/routes/events_leads/exhibit/[slug]/+page.svelte @@ -9,13 +9,13 @@ import { goto, invalidate, pushState, replaceState } from '$app/navigation'; // import { Tab, Tabs } from '@skeletonlabs/skeleton-svelte'; import { Tabs } from '@skeletonlabs/skeleton-svelte'; -import type { key_val } from '$lib/ae_stores'; +import type { key_val } from '$lib/stores/ae_stores'; import { ae_util } from '$lib/ae_utils/ae_utils'; import { api } from '$lib/api/api'; import { liveQuery } from "dexie"; import { db_events } from "$lib/ae_events/db_events"; -import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/stores/ae_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; // Quickly save the data passed from the parent(s) to the Svelte stores, localStorage, and other. @@ -234,19 +234,19 @@ async function handle_submit_form_license_update(event) { if ($events_sess.leads.tmp_license.index === null && $events_sess.leads.tmp_license.email && $events_sess.leads.tmp_license.full_name) { if (!Array.isArray(tmp_obj.license_li_json)) { - tmp_obj.license_li_json = []; + (tmp_obj.license_li_json as key_val[]) = []; } - tmp_obj.license_li_json.push($events_sess.leads.tmp_license); + (tmp_obj?.license_li_json as key_val[] || []).push($events_sess.leads.tmp_license); console.log('Add license:', tmp_obj); } else if ($events_sess.leads.tmp_license.index >= 0 && $events_sess.leads.tmp_license.email && $events_sess.leads.tmp_license.full_name) { - tmp_obj.license_li_json[$events_sess.leads.tmp_license.index] = $events_sess.leads.tmp_license; + ((tmp_obj?.license_li_json || []) as key_val[])[$events_sess.leads.tmp_license.index] = $events_sess.leads.tmp_license; console.log('Update license:', tmp_obj); } else if ($events_sess.leads.tmp_license.index >= 0 && !$events_sess.leads.tmp_license.email && !$events_sess.leads.tmp_license.full_name) { console.log('No license email and full_name to update and there is an index number. Remove the license.'); console.log('Remove License'); let tmp_obj = $event_exhibit_obj; - tmp_obj.license_li_json.splice($events_sess.leads.tmp_license.index, 1); + ((tmp_obj?.license_li_json || []) as any[]).splice($events_sess.leads.tmp_license.index, 1); console.log('Removed license:', tmp_obj); } else if ($events_sess.leads.tmp_license.index === -1) { @@ -258,7 +258,7 @@ async function handle_submit_form_license_update(event) { // tmp_obj.license_li_json.push($events_sess.leads.tmp_license); // Save to local IDB - await db_events.exhibit.put(tmp_obj); + if (tmp_obj) { await db_events.exhibit.put(tmp_obj); } // Save to the database // Data out @@ -377,11 +377,7 @@ async function handle_submit_form(event) { } let ae_promises: key_val = {}; // Promise; -async function handle_update__exhibit({ - obj_type, - obj_id, - data - }) { +async function handle_update__exhibit({obj_type, obj_id, data}: {obj_type: string, obj_id: string, data: key_val}) { console.log('*** handle_update__exhibit() ***'); $ae_sess.ds.update_status = 'starting'; @@ -405,9 +401,8 @@ async function handle_update__exhibit({ console.log(error); return false; }) - .finally(function (update__obj_result) { - $ae_sess.ds.update_status = 'finished'; - return update__obj_result; + .finally(function () { + // return update__obj_result; }) return ae_promises.update__exhibit_obj; diff --git a/src/routes/events_leads/exhibit/[slug]/leads_add_scan backup.svelte b/src/routes/events_leads/exhibit/[slug]/leads_add_scan backup.svelte deleted file mode 100644 index c6d2c55c..00000000 --- a/src/routes/events_leads/exhibit/[slug]/leads_add_scan backup.svelte +++ /dev/null @@ -1,876 +0,0 @@ - - - -
- -{#if $events_loc?.leads.auth_exhibit_kv && $events_loc.leads.auth_exhibit_kv[$events_slct.exhibit_id]} - -{#if $events_loc?.leads.auth_exhibit_kv[$events_slct.exhibit_id].key} -
Leads for: - {$events_loc.leads.auth_exhibit_kv[$events_slct.exhibit_id].key} -
-{:else} -
Please go to the Main tab and select a license to use.
-{/if} - - - -

- - {#if $ae_loc.hub.qr.camera_status == 'unknown'} - You will need to allow access to your device's camera when asked. - {:else if $ae_loc.hub.qr.camera_status == 'denied'} - You need to allow access to your device's camera. Currently this seems to be blocked or denied for this site. - Please check your browser's permissions. - {/if} -

- - - - - - - - - -{#if ($events_loc.leads.show_content__scan_requirements)} - -{:else if (!$events_loc.leads.show_content__scan_requirements)} - -{/if} - - -{#if $events_loc.leads.show_content__scan_requirements} -
-

You will need a device with a camera to scan the QR codes. You will also of course need one or more valid QR codes to scan. - -

-
    -
  • Most laptops, workstations, Android phones/tablets, iPhones, and iPads are compatible
    • -
  • The device must have a current (within the last 4 years) web browser such as Google Chrome, Mozilla Firefox, Apple's Safari, or Microsoft Edge. Opera is not yet fully supported.
    • -
  • There is no Android or Apple app that needs to be installed!
    • -
  • The device must have a camera for scanning or you will need to manually enter attendee badge IDs.
    • -
  • The only permission you need to allow is access to your device's camera when asked.
    • -
-
-{:else} - -{/if} - - -{:else} -
Not logged in. Please log in and select a user license.
-{/if} - -
- - -{#if $events_sess.leads.show_form__search} -
-
-
-

Search

- -
-
- - - - - - -
-
- -
- -
-
- - -
-
- {#if $event_badge_obj_li} - - -
-

{$events_slct.badge_obj_li.length} results found

- - {#each $events_slct.badge_obj_li as event_badge_obj_v2, index} - -
- - - - - {#if $events_sess.leads.show_confirm__add_lead[index]} -
-
-
-

Add Selected?

- -
- -
-
- -
-

Are you sure you want to add {event_badge_obj_v2.full_name} to the leads list?

-

Badge ID: {event_badge_obj_v2.event_badge_id_random}

-
- - - -
-
-
- -
- {/if} - -
- - - - {#if $event_exhibit_obj?.priority || $ae_loc.trusted_access} - {event_badge_obj_v2.full_name} - {:else} - - {event_badge_obj_v2.full_name ? event_badge_obj_v2.full_name.substring(0, 1) + '...' : 'Hidden'} - - {/if} - - - - {#if $event_exhibit_obj?.priority || $ae_loc.trusted_access} - {event_badge_obj_v2.affiliations} - {:else} - - {event_badge_obj_v2.affiliations ? event_badge_obj_v2.affiliations.substring(0, 3) + '...' : 'Hidden'} - - {/if} - - - -
-
- - {/each} -
- - - - - - {:else} -
No results yet
- {/if} -
-
- - -
-
- -
- -
- - {#await search_submit_results} -
- - - Searching... - -
- {:then search_submit_results} - {#if search_submit_results} -
- - - Complete - - - - ( - {$events_slct.badge_obj_li.length} results - {#if $ae_loc.trusted_access} - & - {$event_badge_obj_li.length} cached - {/if} - ) - -
- {/if} - {/await} - -
- submit: {$events_sess?.leads.submit_status__search} -
-
- -
- -
- -
- -
-
-{/if} - - - - - - -{#if $events_sess.leads.show_form__scan} -
-
-
-

Scan

- -
- -
-
- -
- - - - - - -
- {@html $events_sess.leads.qr_scan_result ?? 'No results yet'} -
- - - - - - {#if $events_sess.leads.show_confirm__add_lead[$events_slct.badge_id] && $event_badge_obj} -
-
-
-

Add Scanned?

- -
- -
-
- -
-

Are you sure you want to add {$event_badge_obj.full_name} to the leads list?

-

Badge ID: {$event_badge_obj.event_badge_id_random}

-
- - - -
-
-
- -
- {/if} - - -
- -
- - -
- - - -
- submit: {$events_sess?.leads.submit_status__scan} -
-
- -
- -
- -
- -
-
-{/if} - - - diff --git a/src/routes/events_leads/exhibit/[slug]/leads_add_scan.svelte b/src/routes/events_leads/exhibit/[slug]/leads_add_scan.svelte index 983dde6a..24885872 100644 --- a/src/routes/events_leads/exhibit/[slug]/leads_add_scan.svelte +++ b/src/routes/events_leads/exhibit/[slug]/leads_add_scan.svelte @@ -4,9 +4,9 @@ console.log(`ae_events_leads exhibit [slug] leads_add_scan.svelte`, $events_slct import { ae_util } from '$lib/ae_utils/ae_utils'; import { liveQuery } from "dexie"; import { db_events } from "$lib/ae_events/db_events"; -import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; +import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/stores/ae_stores'; // import { core_func } from '$lib/ae_core_functions'; -import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; +import { events_loc, events_sess, events_slct, events_trigger } from '$lib/stores/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; import Element_qr_scanner from '$lib/elements/element_qr_scanner.svelte'; @@ -152,7 +152,7 @@ function handle_qr_scan_result(event) { console.log(`Ignoring. The object returned was unexpected or not valid.`); console.log(qr_scan_obj); } - } else if (qr_scan_obj.qr_type == 'MECARD') { + } else if (qr_scan_obj && qr_scan_obj.qr_type == 'MECARD') { console.log(`Got a QR type of MECARD. This was not expected, but we will at least display it???`); // https://github.com/ertant/vCard @@ -171,7 +171,7 @@ function handle_qr_scan_result(event) { } } -function handle_qr_camera(event) { +function handle_qr_camera(event: CustomEvent) { console.log('*** handle_qr_camera() ***', event.detail); if (!$ae_loc.hub.qr) { @@ -835,7 +835,7 @@ function handle_qr_camera(event) {