From a3a8f107d345c633488ea9687d95660aca8e3138 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Fri, 15 Nov 2024 14:38:59 -0500 Subject: [PATCH] General clean up. Work on using iframes and setting the height correctly. --- src/routes/idaa/(idaa)/+layout.svelte | 77 +- src/routes/idaa/(idaa)/archives/+page.svelte | 2 + .../(idaa)/archives/[archive_id]/+page.svelte | 3 - .../archives/del 0_archives__main.svelte | 617 --------------- .../del 10_edit__archive_content_obj.svelte | 706 ------------------ .../archives/del 10_edit__archive_obj.svelte | 588 --------------- .../del 10_list__archive_content_obj.svelte | 489 ------------ .../archives/del 10_list__archive_obj.svelte | 151 ---- .../archives/del 10_view__archive_obj.svelte | 244 ------ ...__main.svelte => del 0_posts__main.svelte} | 2 +- ...e => del 10_edit__post_comment_obj.svelte} | 0 ...bj.svelte => del 10_edit__post_obj.svelte} | 0 ..._main.svelte => del 0_events__main.svelte} | 0 13 files changed, 79 insertions(+), 2800 deletions(-) delete mode 100644 src/routes/idaa/(idaa)/archives/del 0_archives__main.svelte delete mode 100644 src/routes/idaa/(idaa)/archives/del 10_edit__archive_content_obj.svelte delete mode 100644 src/routes/idaa/(idaa)/archives/del 10_edit__archive_obj.svelte delete mode 100644 src/routes/idaa/(idaa)/archives/del 10_list__archive_content_obj.svelte delete mode 100644 src/routes/idaa/(idaa)/archives/del 10_list__archive_obj.svelte delete mode 100644 src/routes/idaa/(idaa)/archives/del 10_view__archive_obj.svelte rename src/routes/idaa/(idaa)/bb/{0_posts__main.svelte => del 0_posts__main.svelte} (99%) rename src/routes/idaa/(idaa)/bb/{10_edit__post_comment_obj.svelte => del 10_edit__post_comment_obj.svelte} (100%) rename src/routes/idaa/(idaa)/bb/{10_edit__post_obj.svelte => del 10_edit__post_obj.svelte} (100%) rename src/routes/idaa/(idaa)/recovery_meetings/{0_events__main.svelte => del 0_events__main.svelte} (100%) diff --git a/src/routes/idaa/(idaa)/+layout.svelte b/src/routes/idaa/(idaa)/+layout.svelte index ab14130e..5bfc16c3 100644 --- a/src/routes/idaa/(idaa)/+layout.svelte +++ b/src/routes/idaa/(idaa)/+layout.svelte @@ -1,15 +1,90 @@ + + {$ae_loc.title ?? 'Æ loading...'} + {#if $ae_loc.iframe} + + + + {/if} + + + {#if ($ae_loc.trusted_access)} - +
+ +
{:else}

diff --git a/src/routes/idaa/(idaa)/archives/+page.svelte b/src/routes/idaa/(idaa)/archives/+page.svelte index daccaed3..7be02637 100644 --- a/src/routes/idaa/(idaa)/archives/+page.svelte +++ b/src/routes/idaa/(idaa)/archives/+page.svelte @@ -62,6 +62,8 @@ $: lq__archive_content_obj = liveQuery(async () => { return results; }); + + diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte index e2867af7..612990bf 100644 --- a/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte +++ b/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte @@ -89,12 +89,9 @@ $: lq__archive_content_obj = liveQuery(async () => { }); - if (browser) { console.log('Browser environment detected.'); } - - diff --git a/src/routes/idaa/(idaa)/archives/del 0_archives__main.svelte b/src/routes/idaa/(idaa)/archives/del 0_archives__main.svelte deleted file mode 100644 index 80f9116b..00000000 --- a/src/routes/idaa/(idaa)/archives/del 0_archives__main.svelte +++ /dev/null @@ -1,617 +0,0 @@ - - - -
- - -
-

- Novi: {$idaa_loc.novi_full_name} - - ( - {$idaa_loc.novi_email} - {#if $ae_loc.administrator_access} - Administrator - {:else if $ae_loc.trusted_access} - Trusted - {/if} - UUID: {$idaa_loc.novi_uuid} - ) - -

- -
- -{#if $idaa_loc.archives.show_main__options} -
- - - - - - -
- {#if $slct.archive_id} - - {/if} - {#if $ae_loc.trusted_access} - - {/if} -
- -
-{/if} - - -{#if $idaa_loc.archives.show_list__archive_obj_li} - -{/if} - - -{#if $idaa_loc.archives.show_view__archive_obj && $slct.archive_obj} - -{/if} - - -
- - -{#if $idaa_loc.archives.show_edit__archive_obj} - { - $idaa_loc.archives.show_main__options = true; - $idaa_loc.archives.show_list__archive_obj_li = true; - $idaa_loc.archives.show_edit__archive_obj = false; - $idaa_loc.archives.show_view__archive_obj = false; - - const url = new URL(location); - url.searchParams.delete('archive_id'); - history.pushState({}, '', url); - - let message = {'archive_id': null}; - window.parent.postMessage(message, "*"); - }} - on:report__modal_dimensions={ (event) => { - console.log('*** on:report__modal_dimensions ***'); - console.log(event.detail); - - $ae_app.modal_dimensions = event.detail.modal_dimensions; - }} - > - {@html ($slct.archive_obj.name ? $slct.archive_obj.name : 'New Archive Group')} - - - - - - - -{/if} - - - - - - diff --git a/src/routes/idaa/(idaa)/archives/del 10_edit__archive_content_obj.svelte b/src/routes/idaa/(idaa)/archives/del 10_edit__archive_content_obj.svelte deleted file mode 100644 index fc942ae0..00000000 --- a/src/routes/idaa/(idaa)/archives/del 10_edit__archive_content_obj.svelte +++ /dev/null @@ -1,706 +0,0 @@ - - - -
- - -
- - {#await update_archive_content_obj_promise} -
Saving...
- {:then} - {#if update_archive_content_obj_promise} -
Finished saving
- {:else} - - {/if} - {/await} - -

Archive Content

- - - - - - - - - -
- Public Access with Rotating Access Key/Passcode - - -
- - -

File?

- {#if !$slct.archive_content_id} - - - {/if} - - - - - - - -

Original

- - -
- -
- - - - - - - {#if $ae_loc.trusted_access} -
- -

- Admin Options - -

- - - - - - - - - - - {#if $ae_loc.administrator_access} - - {/if} - - - - - -
- {/if} - - -
- - - {#if $slct.archive_content_id} - - {/if} -
- - - -
- - - diff --git a/src/routes/idaa/(idaa)/archives/del 10_edit__archive_obj.svelte b/src/routes/idaa/(idaa)/archives/del 10_edit__archive_obj.svelte deleted file mode 100644 index 489cd839..00000000 --- a/src/routes/idaa/(idaa)/archives/del 10_edit__archive_obj.svelte +++ /dev/null @@ -1,588 +0,0 @@ - - - -
- -
- - {#await update_archive_obj_promise} -
Saving...
- {:then} - {#if update_archive_obj_promise} -
Finished saving
- {:else} - - {/if} - {/await} - -

Archive

- - - - - - - -

Original

- - -
- -
- - - - - - - - - - - - - - - - - - - - - - - - {#if $ae_loc.trusted_access} -
- -

- Admin Options - -

- - - - - - - - - - - {#if $ae_loc.administrator_access} - - {/if} - - - - - -
- {/if} - - -
- - - {#if $slct.archive_id} - - {/if} -
- -
- -
- - - diff --git a/src/routes/idaa/(idaa)/archives/del 10_list__archive_content_obj.svelte b/src/routes/idaa/(idaa)/archives/del 10_list__archive_content_obj.svelte deleted file mode 100644 index d4f71a95..00000000 --- a/src/routes/idaa/(idaa)/archives/del 10_list__archive_content_obj.svelte +++ /dev/null @@ -1,489 +0,0 @@ - - - -
-{#if $slct.archive_content_obj_li} - -{#each $slct.archive_content_obj_li as idaa_archive_content_obj, index} - -{#if idaa_archive_content_obj.group && idaa_archive_content_obj.group != $slct.archive_content_obj_li[index - 1]?.group} -
- -
-{/if} -{#if $idaa_loc.archives.show_list__archive_content_li_group == idaa_archive_content_obj.group} - -
- -
-

- {idaa_archive_content_obj.name} - - {#if idaa_archive_content_obj.type} {idaa_archive_content_obj.type}{/if} - - {#if $ae_loc.trusted_access && idaa_archive_content_obj.hide} Hidden{/if} - {#if $ae_loc.administrator_access && !idaa_archive_content_obj.enable} Not enabled{/if} -

-
- -
- {#if idaa_archive_content_obj.archive_content_id_random != $idaa_loc.archives.show_view__archive_content_media} - - {:else} - - {/if} - - {#if $ae_loc.trusted_access} - - - Download - - {#if file_icons[idaa_archive_content_obj.file_extension]} - - {:else} - - {/if} - .{idaa_archive_content_obj.file_extension} - - {/if} - - {#if $ae_loc.trusted_access} - - - {/if} -
- - - - {#if idaa_archive_content_obj.archive_content_id_random == $idaa_loc.archives.show_view__archive_content_media} - - {/if} - - -
- {#if idaa_archive_content_obj.description} -
-
Description:
-
- {idaa_archive_content_obj.description} -
-
- {/if} - - {#if idaa_archive_content_obj.content_html} -
-
Content:
-
- {@html idaa_archive_content_obj.content_html} -
-
- {/if} - -
- Original date/time: - {#if idaa_archive_content_obj.original_datetime} - {ae.util.iso_datetime_formatter(idaa_archive_content_obj.original_datetime, 'datetime_long')} - {/if} - {#if idaa_archive_content_obj.original_timezone} - Timezone: - {idaa_archive_content_obj.original_timezone} - {/if} -
- -
- - - -
-{/if} -{/each} - -{:else} -
No archives avalible to show at this time
-{/if} -
- - -{#if $idaa_loc.archives.show_edit__archive_content_id} - - { - $slct.archive_content_id = null; - $slct.archive_content_obj = {}; - - // $idaa_loc.archives.show_main__options = true; - // $idaa_loc.archives.show_list__archive_content_li = true; - $idaa_loc.archives.show_view__archive_content_media = false; - $idaa_loc.archives.show_edit__archive_content_id = false; - // $idaa_loc.archives.show_view__archive_content_id = false; - - const url = new URL(location); - url.searchParams.delete('archive_content_id'); - history.pushState({}, '', url); - - let message = {'archive_content_id': null}; - window.parent.postMessage(message, "*"); - }} - > - {@html ($slct.archive_content_obj.name ? $slct.archive_content_obj.name : 'New Archive Content')} - - - - - - - - -{/if} - - - diff --git a/src/routes/idaa/(idaa)/archives/del 10_list__archive_obj.svelte b/src/routes/idaa/(idaa)/archives/del 10_list__archive_obj.svelte deleted file mode 100644 index 553a7912..00000000 --- a/src/routes/idaa/(idaa)/archives/del 10_list__archive_obj.svelte +++ /dev/null @@ -1,151 +0,0 @@ - - - -
-{#if $slct.archive_obj_li} - -{#each $slct.archive_obj_li as idaa_archive_obj, index} -
- -
- {idaa_archive_obj.name} - {#if idaa_archive_obj.original_location} - ( - - {idaa_archive_obj.original_location} - ) - - {/if} - - {#if $ae_loc.trusted_access && idaa_archive_obj.hide} Hidden{/if} - {#if $ae_loc.administrator_access && !idaa_archive_obj.enable} Not enabled{/if} -
- -
- - - {#if $ae_loc.trusted_access} - - {/if} -
- - -
-
- -
- {@html idaa_archive_obj.description} -
-
-
- - - -
-{/each} - -{:else} -
No archives avalible to show at this time
-{/if} -
- - - diff --git a/src/routes/idaa/(idaa)/archives/del 10_view__archive_obj.svelte b/src/routes/idaa/(idaa)/archives/del 10_view__archive_obj.svelte deleted file mode 100644 index 6cef8a0b..00000000 --- a/src/routes/idaa/(idaa)/archives/del 10_view__archive_obj.svelte +++ /dev/null @@ -1,244 +0,0 @@ - - - -
- -
-

{@html $slct.archive_obj.name}

-
- -
- {#if $slct.archive_obj.description}
{@html $slct.archive_obj.description}
{/if} - {#if $slct.archive_obj.content_html}
{@html $slct.archive_obj.content_html}
{/if} - {#if $slct.archive_obj.original_url} -
- URL: - {$slct.archive_obj.original_url} -
- {/if} - {#if $slct.archive_obj.original_datetime} -
- Start Date: - {ae.util.iso_datetime_formatter($slct.archive_obj.original_datetime, 'datetime_long')} -
- {/if} - {#if $slct.archive_obj.original_timezone} - Timezone: - {$slct.archive_obj.original_timezone} - {/if} - {#if $slct.archive_obj.original_location} -
- Location: - {$slct.archive_obj.original_location} -
- {/if} -
- -
-
-
- Created on: - {ae.util.iso_datetime_formatter($slct.archive_obj.created_on, 'datetime_iso_no_seconds')} - {#if $slct.archive_obj.updated_on} - Updated on: - {ae.util.iso_datetime_formatter($slct.archive_obj.updated_on, 'datetime_iso_no_seconds')} - {/if} -
-
- - {#if $ae_loc.trusted_access} -
- {#if $ae_loc.trusted_access || $slct.archive_obj.external_person_id === $idaa_loc.novi_uuid} - - - - {/if} -
- {/if} -
- -{#if $slct.archive_obj} - - - -{/if} - - - - - - - -
- - - diff --git a/src/routes/idaa/(idaa)/bb/0_posts__main.svelte b/src/routes/idaa/(idaa)/bb/del 0_posts__main.svelte similarity index 99% rename from src/routes/idaa/(idaa)/bb/0_posts__main.svelte rename to src/routes/idaa/(idaa)/bb/del 0_posts__main.svelte index a90c0974..0ff02fcd 100644 --- a/src/routes/idaa/(idaa)/bb/0_posts__main.svelte +++ b/src/routes/idaa/(idaa)/bb/del 0_posts__main.svelte @@ -14,7 +14,7 @@ import { idaa_loc, idaa_sess, idaa_slct } from '$lib/ae_idaa_stores'; // *** Import Aether module variables and functions // *** Import Aether module components -import Edit_post_obj from './10_edit__post_obj.svelte'; +import Edit_post_obj from './del 10_edit__post_obj.svelte'; import View_post_obj from './ae_idaa_comp__post_obj_id_view.svelte'; // *** Export/Exposed variables and functions for component diff --git a/src/routes/idaa/(idaa)/bb/10_edit__post_comment_obj.svelte b/src/routes/idaa/(idaa)/bb/del 10_edit__post_comment_obj.svelte similarity index 100% rename from src/routes/idaa/(idaa)/bb/10_edit__post_comment_obj.svelte rename to src/routes/idaa/(idaa)/bb/del 10_edit__post_comment_obj.svelte diff --git a/src/routes/idaa/(idaa)/bb/10_edit__post_obj.svelte b/src/routes/idaa/(idaa)/bb/del 10_edit__post_obj.svelte similarity index 100% rename from src/routes/idaa/(idaa)/bb/10_edit__post_obj.svelte rename to src/routes/idaa/(idaa)/bb/del 10_edit__post_obj.svelte diff --git a/src/routes/idaa/(idaa)/recovery_meetings/0_events__main.svelte b/src/routes/idaa/(idaa)/recovery_meetings/del 0_events__main.svelte similarity index 100% rename from src/routes/idaa/(idaa)/recovery_meetings/0_events__main.svelte rename to src/routes/idaa/(idaa)/recovery_meetings/del 0_events__main.svelte