diff --git a/src/routes/journals/JournalEntry_Header.svelte b/src/routes/journals/JournalEntry_Header.svelte index b60b0bd1..b4a68fdd 100644 --- a/src/routes/journals/JournalEntry_Header.svelte +++ b/src/routes/journals/JournalEntry_Header.svelte @@ -1,21 +1,17 @@ -
-
- - + - - {#if $journals_loc.entry.edit_kv[entry.journal_entry_id] === 'current'} -
- - - {#if $journals_loc.entry.auto_save} -
- {#if save_status === 'saving'} - - {:else if save_status === 'saved'} - - {:else} - - {/if} -
- {/if} -
- {/if} - -

{#if $journals_loc.entry.edit_kv[entry.journal_entry_id] == 'current'} {:else} - - {#if entry.name} - {@html entry.name} - {:else} - {ae_util.iso_datetime_formatter(entry.created_on, 'datetime_iso_12_no_seconds')} - {/if} - +

+ {entry.name || ae_util.iso_datetime_formatter(entry.created_on, 'datetime_iso_12_no_seconds')} +

{/if} - -
- -
- -
- - - {#if entry.category_code && $journals_loc.entry.edit_kv[entry.journal_entry_id] !== 'current'} - - {/if} - - - - - - - - - - - - - - - - {#if entry.private && entry.content_encrypted} - - {/if} - - - -
- - - {#if $journals_sess.entry.show_menu} -
- -
- {/if} -
-
+ +
+ + {#if $journals_loc.entry.edit_kv[entry.journal_entry_id] === 'current'} +
+ + {#if $journals_loc.entry.auto_save} + {#if save_status === 'saving'} + {:else if save_status === 'saved'} + {:else}{/if} + {/if} +
+ {/if} + + + {#if entry.private} + + {/if} + +
+ + + + + + {#if has_changed && save_status !== 'saving'} + + {/if} +
\ No newline at end of file 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 dbb1f5c1..2e0cea14 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 @@ -25,6 +25,7 @@ import JournalEntry_Metadata from './JournalEntry_Metadata.svelte'; import JournalEntry_AITools from './JournalEntry_AITools.svelte'; import AeCompModalJournalEntryAppend from './ae_comp__modal_journal_entry_append.svelte'; + import ModalJournalEntryConfig from './modal_journal_entry_config.svelte'; // Icons import { AlertCircle, XCircle, Loader2 } from '@lucide/svelte'; @@ -54,6 +55,7 @@ let decryption_error: string | null = $state(null); let auto_save_timer: ReturnType; let is_processing = $state(false); + let show_config_modal = $state(false); // *** Helpers function deep_copy(obj: any) { @@ -91,7 +93,7 @@ if (content_changed || name_changed || private_changed) return true; - const other_fields = ['tags', 'category_code', 'public', 'personal', 'professional']; + const other_fields = ['tags', 'category_code', 'public', 'personal', 'professional', 'archive_on', 'sort']; for (const field of other_fields) { if (normalize(tmp_entry_obj[field]) !== normalize(orig_entry_obj[field])) return true; } @@ -252,7 +254,8 @@ enable: tmp_entry_obj.enable, sort: tmp_entry_obj.sort, group: tmp_entry_obj.group, - data_json: tmp_entry_obj.data_json + data_json: tmp_entry_obj.data_json, + archive_on: tmp_entry_obj.archive_on }; const decrypt_key = $lq__journal_obj.combined_passcode; @@ -363,11 +366,7 @@ has_changed={has_unsaved_changes} onSave={update_journal_entry} onDecrypt={handle_content_decryption} - onDecryptHistory={() => {}} - onChangeJournal={change_journal_id} - onAppend={() => { modal_mode = 'append'; show_append_modal = true; }} - onPrepend={() => { modal_mode = 'prepend'; show_append_modal = true; }} - {onShowExport} + onShowConfig={() => show_config_modal = true} {save_status} {log_lvl} /> @@ -408,7 +407,7 @@ /> - + { show_append_modal = false; }} {log_lvl} /> + + { modal_mode = 'append'; show_append_modal = true; }} + onPrepend={() => { modal_mode = 'prepend'; show_append_modal = true; }} + {log_lvl} + /> {:else}
diff --git a/src/routes/journals/ae_comp__journal_obj_id_edit.svelte b/src/routes/journals/ae_comp__journal_obj_id_edit.svelte index 3a1613df..2c873266 100644 --- a/src/routes/journals/ae_comp__journal_obj_id_edit.svelte +++ b/src/routes/journals/ae_comp__journal_obj_id_edit.svelte @@ -1,1258 +1,328 @@ - - {#snippet header()} -

- - - - - Edit Journal / Settings: - - {$lq__journal_obj?.name ?? '-- not set --'} +

+ + Edit Journal: {lq__journal_obj?.name ?? '--'}

{/snippet} -
-
- {#if !tmp__journal_obj || typeof tmp__journal_obj.cfg_json !== 'object'} - Not found or loading? - {:else} -
- - - - - -
- -
- - -
- - -
- - -
- - -
- -
-
- - - - - - - -
- Journal Type: - -
- -
- - - -
- {#each tmp__journal_obj?.cfg_json?.category_li as category, index} -
- - - -
- {/each} - -
-
- - -
- - - - -
- - -
- - - - -
- - -
- - -
- - -
- - - - - -
- - -
- - - - - -
- - - - -
- - -
- -
- - -
- -
- - -
- - -
- - - - - - - - - - - - - -
- - -
- - - - - - - - - -
- - -
- - - - - - - - - - - - - - - - - -
- - - -
- -
- - - - - - - - {#if $lq__journal_obj?.sort} - {$lq__journal_obj.sort} - {:else} - - {/if} - - - - - - { - let data_kv = { - group: tmp__journal_obj.group - }; - journals_func - .update_ae_obj__journal({ - api_cfg: $ae_api, - journal_id: $lq__journal_obj?.journal_id, - data_kv: data_kv, - log_lvl: log_lvl - }) - .then(() => { - alert('Journal group updated successfully!'); - }) - .catch((error) => { - console.error('Error updating journal group:', error); - alert('Failed to update journal group.'); - }); - }} - class="input input-sm input-bordered w-24" - title="Set group (for sorting) of this journal" - /> - - - - - - - - - -
- {/if} +
+ +
+ + + +
+ + {#if tab === 'general'} +
+ +
+ + +
+ + +
+
+ + +
+

+ + Journal Categories +

+
+ {#each tmp__journal_obj?.cfg_json?.category_li ?? [] as category, i} +
+ + + +
+ {/each} + +
+
+
+ + {:else if tab === 'security'} +
+
+

+ + Encryption Passcodes +

+
+ + +
+ * Note: Passcodes are used locally for E2EE. Primary is often stored in the DB, while Private should remain known only to you. +
+
+
+ +
+

+ + Status & Lifecycle +

+
+ + + +
+
+ + +
+ + {:else if tab === 'ui'} +
+
+

+ + Editor & Viewer +

+
+ + +
+
+ +
+

+ + Visual Theme +

+ +
+
+ + {:else if tab === 'json'} +
+ +
+ {/if}
{#snippet footer()} -
- - -
{/snippet} - + \ No newline at end of file diff --git a/src/routes/journals/modal_journal_entry_config.svelte b/src/routes/journals/modal_journal_entry_config.svelte new file mode 100644 index 00000000..2662c619 --- /dev/null +++ b/src/routes/journals/modal_journal_entry_config.svelte @@ -0,0 +1,220 @@ + + + + {#snippet header()} +

+ + Entry Settings: {tmp_entry_obj.name || '--'} +

+ {/snippet} + +
+ +
+ + + + +
+ + {#if tab === 'actions'} +
+
+ + + + +
+ +
+

Quick Category

+
+ {#each journal?.cfg_json?.category_li ?? [] as cat} + + {/each} +
+
+
+ + {:else if tab === 'meta'} +
+ + + + +
+ + +
+
+ + {:else if tab === 'security'} +
+
+

Privacy Flags

+ +
+ + {#if tmp_entry_obj.private && !tmp_entry_obj.content && tmp_entry_obj.content_encrypted} +
+
+

+ Disaster Recovery +

+

If the encryption passcode is lost, the data is unrecoverable. You can force a reset to plain text to reuse this entry ID.

+ +
+
+ {/if} + +
+ +
+
+ + {:else if tab === 'json'} +
+ +
+ {/if} +
+ + {#snippet footer()} + + {/snippet} + \ No newline at end of file diff --git a/src/routes/journals/modal_journals_config.svelte b/src/routes/journals/modal_journals_config.svelte index cdd88609..e96c4dfa 100644 --- a/src/routes/journals/modal_journals_config.svelte +++ b/src/routes/journals/modal_journals_config.svelte @@ -1,81 +1,42 @@ {#snippet header()} -

- - - - - Æ Journals Settings: - - {$journals_loc?.name ?? '-- not set --'} +

+ + Æ Journals Module Settings

{/snippet} -
-
- -
- - - -
- - -
+ +
+ + + +
-
+ {#if tab === 'form'} +
+ +
+

+ + Date and Time Display +

+
-
-
-
+ - -
+ +
+

+ + User Interface Preferences +

+
+ + +
+
+ + +
+

+ + Security & Encryption +

+
+
+ Global security overrides for the journal module. +
+ +
+
+
+ {:else if tab === 'local_json'} +
-
- - -
+ {:else if tab === 'session_json'} +
-
-
+ {/if}
{#snippet footer()} - {/snippet} - + \ No newline at end of file