diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 63558e76..7699e08f 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -373,38 +373,6 @@ onMount(() => { - - diff --git a/src/routes/events_pres_mgmt/presenter/[slug]/+page.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte similarity index 97% rename from src/routes/events_pres_mgmt/presenter/[slug]/+page.svelte rename to src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte index 20b1b33c..c3fdd480 100644 --- a/src/routes/events_pres_mgmt/presenter/[slug]/+page.svelte +++ b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte @@ -18,11 +18,11 @@ import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$ import { events_loc, events_sess, events_slct, events_trigger } from '$lib/ae_events_stores'; import { events_func } from '$lib/ae_events_functions'; -import Comp_event_files_upload from './../../ae_comp__event_files_upload.svelte'; +import Comp_event_files_upload from '../../../../events_pres_mgmt/ae_comp__event_files_upload.svelte'; import Element_manage_event_file_li_wrap from '$lib/element_manage_event_file_li_direct.svelte'; -import Comp_event_presenter_form_agree from '../../ae_comp__event_presenter_form_agree.svelte'; -import Presenter_view from './../../presenter_view.svelte'; -import Presenter_page_menu from './../../presenter_page_menu.svelte'; +import Comp_event_presenter_form_agree from './ae_comp__event_presenter_form_agree.svelte'; +import Presenter_view from './presenter_view.svelte'; +import Presenter_page_menu from './presenter_page_menu.svelte'; // Exports export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher' diff --git a/src/routes/events_pres_mgmt/presenter/[slug]/+page.ts b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.ts similarity index 84% rename from src/routes/events_pres_mgmt/presenter/[slug]/+page.ts rename to src/routes/events/[event_id]/presenter/[presenter_id]/+page.ts index 32ee3d19..7f6ea9f1 100644 --- a/src/routes/events_pres_mgmt/presenter/[slug]/+page.ts +++ b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.ts @@ -1,5 +1,5 @@ /** @type {import('./$types').PageLoad} */ -console.log(`ae_p_event_presenter [slug] +page.ts: start`); +console.log(`ae_p_event_presenter [presenter_id] +page.ts: start`); import { browser } from '$app/environment'; import { events_func } from '$lib/ae_events_functions'; @@ -8,16 +8,16 @@ export async function load({ params, parent }) { // route let log_lvl = 0; let data = await parent(); - // console.log(`ae events_pres_mgmt presenter [slug] +page.ts data:`, data); + // console.log(`ae events_pres_mgmt presenter [presenter_id] +page.ts data:`, data); data.log_lvl = log_lvl; let account_id = data.account_id; let ae_acct = data[account_id]; // console.log(`ae_acct = `, ae_acct); - let event_presenter_id = params.slug; + let event_presenter_id = params.presenter_id; // if (!event_presenter_id) { - // console.log(`ae events_pres_mgmt presenter [slug] +page.ts: The event_presenter_id was not found in the params.slug!!!`); + // console.log(`ae events_pres_mgmt presenter [presenter_id] +page.ts: The event_presenter_id was not found in the params.presenter_id!!!`); // return false; // } diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presenter_form_agree.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte similarity index 100% rename from src/routes/events_pres_mgmt/ae_comp__event_presenter_form_agree.svelte rename to src/routes/events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte diff --git a/src/routes/events_pres_mgmt/presenter_page_menu.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte similarity index 98% rename from src/routes/events_pres_mgmt/presenter_page_menu.svelte rename to src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte index c2f5e993..220c8c64 100644 --- a/src/routes/events_pres_mgmt/presenter_page_menu.svelte +++ b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_page_menu.svelte @@ -10,7 +10,7 @@ import { events_func } from '$lib/ae_events_functions'; import Element_ae_crud from '$lib/element_ae_crud.svelte'; import Element_data_store from '$lib/element_data_store_v2.svelte'; -import Comp__pres_mgmt_menu_nav from './ae_comp__pres_mgmt_menu_nav.svelte'; +import Comp__events_menu_nav from './../../../ae_comp__events_menu_nav.svelte'; // import Sign_in_out from './sign_in_out.svelte'; // Should this be used here later??? @@ -33,11 +33,11 @@ let ae_triggers: key_val = {};
- Presenter URL - + diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte index 6b3ad368..8f007d56 100644 --- a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte +++ b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_li.svelte @@ -102,8 +102,9 @@ let lq__event_presentation_obj = liveQuery(
  • + {event_presenter_obj?.full_name} @@ -119,6 +119,7 @@ export let show_session_fields: boolean = false; {#if show_session_fields} + +/** @type {import('./$types').LayoutData} */ +export let data: any; +let log_lvl = 0; + + + + + - \ No newline at end of file diff --git a/src/routes/idaa/(idaa)/app.pcss b/src/routes/idaa/(idaa)/hold_app.pcss similarity index 100% rename from src/routes/idaa/(idaa)/app.pcss rename to src/routes/idaa/(idaa)/hold_app.pcss diff --git a/src/routes/idaa/(idaa)/main.ts b/src/routes/idaa/(idaa)/hold_main.ts similarity index 100% rename from src/routes/idaa/(idaa)/main.ts rename to src/routes/idaa/(idaa)/hold_main.ts diff --git a/src/routes/idaa/(idaa)/stores.ts b/src/routes/idaa/(idaa)/hold_stores.ts similarity index 100% rename from src/routes/idaa/(idaa)/stores.ts rename to src/routes/idaa/(idaa)/hold_stores.ts diff --git a/src/routes/idaa/(idaa)/stores_ae_api.js b/src/routes/idaa/(idaa)/hold_stores_ae_api.js similarity index 97% rename from src/routes/idaa/(idaa)/stores_ae_api.js rename to src/routes/idaa/(idaa)/hold_stores_ae_api.js index 4a0da48e..abde2c57 100644 --- a/src/routes/idaa/(idaa)/stores_ae_api.js +++ b/src/routes/idaa/(idaa)/hold_stores_ae_api.js @@ -1,6 +1,6 @@ console.log('*** stores_data_store_api.js Stores ***'); import { get } from 'svelte/store'; -import { ae_app } from './stores'; +import { ae_app } from './hold_stores'; import { api } from 'aether_npm_lib'; diff --git a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte index f6e9d5f9..0bd57026 100644 --- a/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte +++ b/src/routes/idaa/(idaa)/recovery_meetings/+page.svelte @@ -63,9 +63,6 @@ $: lq__event_obj = liveQuery(async () => { - {/if} diff --git a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_view.svelte b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_view.svelte index 9c7af09f..ce4f1484 100644 --- a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_view.svelte +++ b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_view.svelte @@ -234,7 +234,8 @@ onMount(() => { ( Your TZ: - {dayjs.tz(`${$ae_loc.current_date_str} ${$lq__event_obj?.recurring_start_time}`, $lq__event_obj?.timezone).tz($ae_loc.current_timezone).format('hh:mm A')} {$ae_loc.current_timezone} + + DAYJS DISABLED ) diff --git a/src/routes/idaa/hold_+layout.svelte b/src/routes/idaa/hold_+layout.svelte new file mode 100644 index 00000000..6eff8f21 --- /dev/null +++ b/src/routes/idaa/hold_+layout.svelte @@ -0,0 +1,6 @@ + + + +