diff --git a/src/routes/journals/JournalEntry_Header.svelte b/src/routes/journals/JournalEntry_Header.svelte index 138bf099..732c4df6 100644 --- a/src/routes/journals/JournalEntry_Header.svelte +++ b/src/routes/journals/JournalEntry_Header.svelte @@ -29,6 +29,7 @@ onChangeJournal: () => void; onAppend?: () => void; onPrepend?: () => void; + onShowExport?: () => void; save_status?: 'saved' | 'unsaved' | 'saving'; log_lvl?: number; } @@ -45,6 +46,7 @@ onChangeJournal, onAppend, onPrepend, + onShowExport, save_status = 'saved', log_lvl = 0 }: Props = $props(); @@ -257,6 +259,7 @@ p-2 md:p-3 rounded-lg shadow-md {onChangeJournal} {onAppend} {onPrepend} + {onShowExport} {log_lvl} /> diff --git a/src/routes/journals/JournalEntry_SettingsMenu.svelte b/src/routes/journals/JournalEntry_SettingsMenu.svelte index de53d8f2..765cae9c 100644 --- a/src/routes/journals/JournalEntry_SettingsMenu.svelte +++ b/src/routes/journals/JournalEntry_SettingsMenu.svelte @@ -10,7 +10,7 @@ Clock, X, Trash2, Settings, Shapes, Copy, RemoveFormatting, CodeXml, TypeOutline, History, Pencil, PenLine, FileX, SquareLibrary, - ArrowUpToLine, ArrowDownToLine + ArrowUpToLine, ArrowDownToLine, FileDown } from '@lucide/svelte'; import { ae_loc, ae_api } from '$lib/stores/ae_stores'; import { journals_slct, journals_loc, journals_sess } from '$lib/ae_journals/ae_journals_stores'; @@ -29,6 +29,7 @@ onChangeJournal: () => void; onAppend?: () => void; onPrepend?: () => void; + onShowExport?: () => void; log_lvl?: number; } @@ -42,6 +43,7 @@ onChangeJournal, onAppend, onPrepend, + onShowExport, log_lvl = 0 }: Props = $props(); @@ -98,6 +100,22 @@ + + +
diff --git a/src/routes/journals/[journal_id]/+page.svelte b/src/routes/journals/[journal_id]/+page.svelte index c85d3a79..63ca087b 100644 --- a/src/routes/journals/[journal_id]/+page.svelte +++ b/src/routes/journals/[journal_id]/+page.svelte @@ -329,16 +329,7 @@ " > --> - - - - {#if $lq__journal_entry_obj_li && $lq__journal_entry_obj_li.length > 0} -
- -
- {/if} + show_export_modal = true} /> {#if $lq__journal_entry_obj_li && $lq__journal_entry_obj_li?.length} diff --git a/src/routes/journals/[journal_id]/entry/[journal_entry_id]/+page.svelte b/src/routes/journals/[journal_id]/entry/[journal_entry_id]/+page.svelte index aa7cd5ef..46a547a1 100644 --- a/src/routes/journals/[journal_id]/entry/[journal_entry_id]/+page.svelte +++ b/src/routes/journals/[journal_id]/entry/[journal_entry_id]/+page.svelte @@ -36,6 +36,7 @@ import Journal_entry_view from './../../../ae_comp__journal_entry_obj_id_view.svelte'; // import Journal_page_menu from './session_page_menu.svelte'; // import Element_data_store from '$lib/element_data_store_v2.svelte'; + import AeCompModalJournalExport from '../../../ae_comp__modal_journal_export.svelte'; interface Props { data: any; @@ -50,6 +51,8 @@ // Variables // *** Quickly pull out data from parent(s) let ae_acct = data[$slct.account_id]; + let show_export_modal = $state(false); + $effect(() => { if (log_lvl) { console.log(`ae_acct = `, ae_acct); @@ -315,9 +318,15 @@ " > - + show_export_modal = true} /> + + show_export_modal = false} + /> {:else}

You must be logged in as the owner to view this Journal Entry.

diff --git a/src/routes/journals/ae_comp__journal_entry_obj_id_view.svelte b/src/routes/journals/ae_comp__journal_entry_obj_id_view.svelte index 81a2f845..befe5e0a 100644 --- a/src/routes/journals/ae_comp__journal_entry_obj_id_view.svelte +++ b/src/routes/journals/ae_comp__journal_entry_obj_id_view.svelte @@ -39,15 +39,25 @@ lq__journal_obj: any; lq__journal_obj_li: any; lq__journal_entry_obj: any; + onShowExport?: () => void; } let { log_lvl = 0, lq__journal_obj, lq__journal_obj_li, - lq__journal_entry_obj + lq__journal_entry_obj, + onShowExport }: Props = $props(); + $effect(() => { + if (onShowExport) { + console.log('ae_comp__journal_entry_obj_id_view: onShowExport prop is defined'); + } else { + console.warn('ae_comp__journal_entry_obj_id_view: onShowExport prop is UNDEFINED'); + } + }); + // *** State let editorView: any = $state(); let ae_promises: any = $state(); @@ -555,6 +565,7 @@ onChangeJournal={change_journal_id} onAppend={handle_append_start} onPrepend={handle_prepend_start} + {onShowExport} {save_status} {log_lvl} /> diff --git a/src/routes/journals/ae_comp__journal_obj_id_view.svelte b/src/routes/journals/ae_comp__journal_obj_id_view.svelte index 55a646ae..e62cd269 100644 --- a/src/routes/journals/ae_comp__journal_obj_id_view.svelte +++ b/src/routes/journals/ae_comp__journal_obj_id_view.svelte @@ -3,7 +3,7 @@ import { goto } from '$app/navigation'; // *** Import other supporting libraries - import { BookPlus, BookOpenText, FilePlus, Menu, Pencil } from '@lucide/svelte'; + import { BookPlus, BookOpenText, FilePlus, Menu, Pencil, FileDown } from '@lucide/svelte'; // *** Import Aether specific variables and functions import { ae_util } from '$lib/ae_utils/ae_utils'; @@ -29,9 +29,10 @@ log_lvl?: number; lq__journal_obj: any; lq__journal_entry_obj_li: any; + onShowExport?: () => void; } - let { log_lvl = 0, lq__journal_obj, lq__journal_entry_obj_li }: Props = $props(); + let { log_lvl = 0, lq__journal_obj, lq__journal_entry_obj_li, onShowExport }: Props = $props(); // let ae_promises: key_val = {}; // let ae_tmp: key_val = {}; @@ -265,6 +266,26 @@ + + {#if $lq__journal_entry_obj_li && $lq__journal_entry_obj_li.length > 0} + + {/if}