From 6a8148228f5384554831bd431343398389a12665 Mon Sep 17 00:00:00 2001
From: Scott Idem <stidem@gmail.com>
Date: Fri, 27 Sep 2024 17:21:57 -0400
Subject: [PATCH] Organizing things better. Hopefully nothing is broken!! Still
 need to move the event session related.

---
 src/routes/+layout.svelte                     | 32 -------------------
 .../presenter/[presenter_id]}/+page.svelte    |  8 ++---
 .../presenter/[presenter_id]}/+page.ts        |  8 ++---
 ...ae_comp__event_presenter_form_agree.svelte |  0
 .../presenter_page_menu.svelte                |  8 ++---
 .../[presenter_id]}/presenter_view.svelte     |  2 +-
 .../ae_comp__event_presenter_obj_li.svelte    |  3 +-
 .../ae_comp__event_presenter_obj_tbl.svelte   |  3 +-
 .../session/[slug]/+page.svelte               |  2 +-
 src/routes/idaa/(idaa)/+layout.svelte         | 10 +++++-
 .../idaa/(idaa)/{app.pcss => hold_app.pcss}   |  0
 .../idaa/(idaa)/{main.ts => hold_main.ts}     |  0
 .../idaa/(idaa)/{stores.ts => hold_stores.ts} |  0
 ...stores_ae_api.js => hold_stores_ae_api.js} |  2 +-
 .../(idaa)/recovery_meetings/+page.svelte     |  3 --
 .../ae_idaa_comp__event_obj_id_view.svelte    |  3 +-
 src/routes/idaa/hold_+layout.svelte           |  6 ++++
 17 files changed, 36 insertions(+), 54 deletions(-)
 rename src/routes/{events_pres_mgmt/presenter/[slug] => events/[event_id]/presenter/[presenter_id]}/+page.svelte (97%)
 rename src/routes/{events_pres_mgmt/presenter/[slug] => events/[event_id]/presenter/[presenter_id]}/+page.ts (84%)
 rename src/routes/{events_pres_mgmt => events/[event_id]/presenter/[presenter_id]}/ae_comp__event_presenter_form_agree.svelte (100%)
 rename src/routes/{events_pres_mgmt => events/[event_id]/presenter/[presenter_id]}/presenter_page_menu.svelte (98%)
 rename src/routes/{events_pres_mgmt => events/[event_id]/presenter/[presenter_id]}/presenter_view.svelte (99%)
 rename src/routes/idaa/(idaa)/{app.pcss => hold_app.pcss} (100%)
 rename src/routes/idaa/(idaa)/{main.ts => hold_main.ts} (100%)
 rename src/routes/idaa/(idaa)/{stores.ts => hold_stores.ts} (100%)
 rename src/routes/idaa/(idaa)/{stores_ae_api.js => hold_stores_ae_api.js} (97%)
 create mode 100644 src/routes/idaa/hold_+layout.svelte

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(() => {
             </svelte:fragment>
         </AppBar>
 
-
-        <!-- <AppBar>
-            <svelte:fragment slot="lead">
-                <strong class="text-xl uppercase">Skeleton</strong>
-            </svelte:fragment>
-            <svelte:fragment slot="trail">
-                <a
-                    class="btn btn-sm variant-ghost-surface"
-                    href="https://discord.gg/EXqV7W8MtY"
-                    target="_blank"
-                    rel="noreferrer"
-                >
-                    Discord
-                </a>
-                <a
-                    class="btn btn-sm variant-ghost-surface"
-                    href="https://twitter.com/SkeletonUI"
-                    target="_blank"
-                    rel="noreferrer"
-                >
-                    Twitter
-                </a>
-                <a
-                    class="btn btn-sm variant-ghost-surface"
-                    href="https://github.com/skeletonlabs/skeleton"
-                    target="_blank"
-                    rel="noreferrer"
-                >
-                    GitHub
-                </a>
-            </svelte:fragment>
-        </AppBar> -->
     </svelte:fragment>
 
 
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 = {};
     <div
         class="flex flex-row flex-wrap gap-1 items-center justify-around w-full">
 
-    <Comp__pres_mgmt_menu_nav
+    <Comp__events_menu_nav
         hide={false}
         event_id={$lq__event_presenter_obj?.event_id_random}
-        pres_mgmt__session_id={$lq__event_presenter_obj?.event_session_id_random}
-        pres_mgmt__session_search={$events_slct.event_id}
+        events__session_id={$lq__event_presenter_obj?.event_session_id_random}
+        events__session_search={$events_slct.event_id}
         />
 
     <span
diff --git a/src/routes/events_pres_mgmt/presenter_view.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte
similarity index 99%
rename from src/routes/events_pres_mgmt/presenter_view.svelte
rename to src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte
index f1a9b329..760af896 100644
--- a/src/routes/events_pres_mgmt/presenter_view.svelte
+++ b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte
@@ -476,7 +476,7 @@ $: if ($lq__event_presenter_obj) {
                 <span class="fas fa-link"></span>
                 <span>Presenter URL</span>
             </span>
-            <!-- URL: <a href="{$ae_loc.url_origin}/events_pres_mgmt/presenter/{$lq__event_presenter_obj?.event_presenter_id_random}" target="_blank">{$ae_loc.url_origin}/events_pres_mgmt/presenter/{$lq__event_presenter_obj?.event_presenter_id_random}</a> -->
+            <!-- URL: <a href="{$ae_loc.url_origin}/events/{$lq__event_presenter_obj?.event_id_random}/presenter/{$lq__event_presenter_obj?.event_presenter_id_random}" target="_blank">{$ae_loc.url_origin}/events/{$lq__event_presenter_obj?.event_id_random}/presenter/{$lq__event_presenter_obj?.event_presenter_id_random}</a> -->
             <div class="hidden">
                 This QR is a link back to this page.
             </div>
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(
         <li
             class:dim={event_presenter_obj?.hide}
             >
+            <!-- href="/events_pres_mgmt/presenter/{event_presenter_obj.event_presenter_id_random}" -->
             <a
-                href="/events_pres_mgmt/presenter/{event_presenter_obj.event_presenter_id_random}"
+                href="/events/{event_presenter_obj.event_id_random}/presenter/{event_presenter_obj.event_presenter_id_random}"
                 class="btn variant-ghost-primary hover:variant-filled-primary font-bold min-w-64 max-w-96 my-0.5 overflow-hidden"
                 class:btn-sm={display_mode != 'default'}
                 title="Person ID: {event_presenter_obj.person_id_random}; Email: {event_presenter_obj.email}"
diff --git a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte
index ae9ac9ff..b8a4cd5b 100644
--- a/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte
+++ b/src/routes/events_pres_mgmt/ae_comp__event_presenter_obj_tbl.svelte
@@ -98,7 +98,7 @@ export let show_session_fields: boolean = false;
             <td class="px-4 py-2">
                 <span class="fas fa-user"></span>
                 <a
-                    href="/events_pres_mgmt/presenter/{event_presenter_obj?.event_presenter_id_random}"
+                    href="/events/{event_presenter_obj?.event_id_random}/presenter/{event_presenter_obj?.event_presenter_id_random}"
                     class="text-blue-500 underline hover:text-blue-800"
                     >
                     {event_presenter_obj?.full_name}
@@ -119,6 +119,7 @@ export let show_session_fields: boolean = false;
             {#if show_session_fields}
             <td class="px-4 py-2 lg:text-xs">
                 <span class="fas fa-chalkboard-teacher"></span>
+                <!-- href="/events/{event_presenter_obj?.event_id_random}/session/{event_presenter_obj?.event_session_id_random}" -->
                 <a
                     href="/events_pres_mgmt/session/{event_presenter_obj?.event_session_id_random}"
                     class="text-blue-500 underline hover:text-blue-800"
diff --git a/src/routes/events_pres_mgmt/session/[slug]/+page.svelte b/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
index b81aab50..56f353ff 100644
--- a/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
+++ b/src/routes/events_pres_mgmt/session/[slug]/+page.svelte
@@ -24,7 +24,7 @@ import { events_loc, events_sess, events_slct, events_trigger, events_trig_kv }
 import { events_func } from '$lib/ae_events_functions';
 
 import Comp_event_files_upload from './../../ae_comp__event_files_upload.svelte';
-import Comp_event_presenter_form_agree from './../../ae_comp__event_presenter_form_agree.svelte';
+import Comp_event_presenter_form_agree from '../../../events/[event_id]/presenter/[presenter_id]/ae_comp__event_presenter_form_agree.svelte';
 import Element_manage_event_file_li_wrap from '$lib/element_manage_event_file_li_direct.svelte';
 import Session_view from './../../session_view.svelte';
 import Session_page_menu from './../../session_page_menu.svelte';
diff --git a/src/routes/idaa/(idaa)/+layout.svelte b/src/routes/idaa/(idaa)/+layout.svelte
index 13e960cc..e17f74a4 100644
--- a/src/routes/idaa/(idaa)/+layout.svelte
+++ b/src/routes/idaa/(idaa)/+layout.svelte
@@ -1,2 +1,10 @@
+<script lang="ts">
+/** @type {import('./$types').LayoutData} */
+export let data: any;
+let log_lvl = 0;
+</script>
+
+
+<slot />
+
 
-<slot />
\ 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 () => {
     <Comp__event_obj_li
         lq__event_obj_li={lq__event_obj_li}
         />
-    <!-- {#each $lq__event_obj_li as event_obj}
-        <div>{event_obj.name}</div>
-    {/each} -->
 {/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(() => {
                     (
                     <span class="ae_label">Your TZ:</span>
                     <span class="ae_value">
-                        {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.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
                     </span>
                     )
                 </span>
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 @@
+<script lang="ts">
+/** @type {import('./$types').LayoutData} */
+</script>
+
+
+<slot />