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 = {};