From 14d4be848aa269f4f7fb9f1a830b37b159e74cc8 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Wed, 6 Nov 2024 15:25:17 -0500 Subject: [PATCH] Cleaning things up before going back to making the forms functional. --- .../(idaa)/archives/[archive_id]/+page.svelte | 16 +- ...a_comp__archive_content_obj_id_edit.svelte | 272 +++++----- ...e_idaa_comp__archive_content_obj_li.svelte | 4 +- .../ae_idaa_comp__archive_obj_id_edit.svelte | 478 ++++++++++++++++++ .../ae_idaa_comp__archive_obj_id_view.svelte | 20 +- .../ae_idaa_comp__archive_obj_li.svelte | 4 +- .../ae_idaa_comp__event_obj_id_edit.svelte | 2 +- 7 files changed, 637 insertions(+), 159 deletions(-) create mode 100644 src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_obj_id_edit.svelte diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte index e3b514c6..a9c78abd 100644 --- a/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte +++ b/src/routes/idaa/(idaa)/archives/[archive_id]/+page.svelte @@ -22,6 +22,7 @@ import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$ import { idaa_loc, idaa_sess, idaa_slct, idaa_trigger } from '$lib/ae_idaa_stores'; import { archives_func } from '$lib/ae_archives/ae_archives_functions'; +import Archive_obj_id_edit from './ae_idaa_comp__archive_obj_id_edit.svelte'; import Archive_view from './ae_idaa_comp__archive_obj_id_view.svelte'; // import Archive_page_menu from './session_page_menu.svelte'; @@ -41,7 +42,7 @@ console.log(`ae_acct = `, ae_acct); // For some reason data.params.archive_id (or whatever param) is not being passed to this page when loaded by a link from another page. This seems to be a bug with Svelte or SvelteKit. Hopefully fixed in a future version 5? 2024-11-06 $idaa_slct.archive_id = ae_acct.slct.archive_id; -$idaa_slct.archive_obj = ae_acct.slct.archive_obj; +// $idaa_slct.archive_obj = ae_acct.slct.archive_obj; $: lq__archive_obj = liveQuery(async () => { @@ -148,18 +149,18 @@ if (browser) { - - + - - + \ No newline at end of file diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte index a58f1da9..0ef7f8e3 100644 --- a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte +++ b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_content_obj_id_edit.svelte @@ -334,36 +334,44 @@ async function handle_submit_form(event) { {/if} {/await} -

Archive Content

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

File?

+ {#if !$idaa_slct.archive_content_id} + FILE INPUT GOES HERE + - - {/if} - - - - - - -

Original

- - -
-
- + - + + +
+ +
+ +

Original

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

+
+ +

Admin Options -

@@ -561,7 +559,7 @@ async function handle_submit_form(event) { {/if} -
+
@@ -575,15 +573,15 @@ async function handle_submit_form(event) { $idaa_slct.archive_content_id = null; $idaa_slct.archive_content_obj = {}; }} - class="ae_btn ae_smallest btn btn-danger" type="button"> - Delete + class="btn btn-sm variant-soft-warning" type="button"> + Delete {/if}
-
+
diff --git a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_obj_id_view.svelte b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_obj_id_view.svelte index 28e3d97f..6698f675 100644 --- a/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_obj_id_view.svelte +++ b/src/routes/idaa/(idaa)/archives/[archive_id]/ae_idaa_comp__archive_obj_id_view.svelte @@ -71,12 +71,12 @@ onMount(() => { on:click={() => { $slct.archive_content_id = null; $slct.archive_content_obj = {}; - $idaa_loc.archives.show_edit__archive_content_id = true; + $idaa_sess.archives.show_edit__archive_content_id = true; }} - class="ae_btn ae_smallest btn btn-warning" + class="btn btn-sm variant-glass-warning" title={`Add content for: ${$lq__archive_obj?.name}`} > - Add Content + Add Content {/if} diff --git a/src/routes/idaa/(idaa)/archives/ae_idaa_comp__archive_obj_li.svelte b/src/routes/idaa/(idaa)/archives/ae_idaa_comp__archive_obj_li.svelte index 6c8b30ec..a56dcd1f 100644 --- a/src/routes/idaa/(idaa)/archives/ae_idaa_comp__archive_obj_li.svelte +++ b/src/routes/idaa/(idaa)/archives/ae_idaa_comp__archive_obj_li.svelte @@ -93,8 +93,8 @@ onMount(() => { $idaa_slct.archive_id = idaa_archive_obj.archive_id; $idaa_slct.archive_obj = idaa_archive_obj; - $idaa_sess.archives.show__modal_view = false; - $idaa_sess.archives.show__modal_edit__archive_obj = true; + $idaa_sess.archives.show__modal_view__archive_id = false; + $idaa_sess.archives.show__modal_edit__archive_id = $idaa_slct.archive_id; }} class="btn btn-sm variant-ghost-warning hover:variant-filled-warning transition" title={`Edit archive: ${idaa_archive_obj.title}`} diff --git a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_edit.svelte b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_edit.svelte index ec0e9b6a..ac466c82 100644 --- a/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_edit.svelte +++ b/src/routes/idaa/(idaa)/recovery_meetings/ae_idaa_comp__event_obj_id_edit.svelte @@ -1248,7 +1248,7 @@ async function handle_delete_event_obj({event_id, method='disable'}) { if (!confirm('Are you sure you want to create this event?')) {return false;} // handle_save_event_obj({event_id: $idaa_slct.event_id, method: 'create'}); }} - class="ae_btn btn_primary btn btn-primary variant-ghost-primary hover:variant-filled-primary transition" + class="btn btn-md variant-ghost-primary hover:variant-filled-primary transition" > {#await prom_api__event_obj} Saving