diff --git a/src/lib/ae_journals/ae_journals__journal.ts b/src/lib/ae_journals/ae_journals__journal.ts index a6489cb6..251e568a 100644 --- a/src/lib/ae_journals/ae_journals__journal.ts +++ b/src/lib/ae_journals/ae_journals__journal.ts @@ -561,6 +561,9 @@ export function db_save_ae_obj_li__journal( passcode_write: obj.passcode_write, passcode_write_expire: obj.passcode_write_expire, + passcode: obj.passcode, + passcode_timeout: obj.passcode_timeout, + enable: obj.enable, hide: obj.hide, priority: obj.priority, diff --git a/src/lib/ae_journals/ae_journals_stores.ts b/src/lib/ae_journals/ae_journals_stores.ts index 89c59ad1..33c93a61 100644 --- a/src/lib/ae_journals/ae_journals_stores.ts +++ b/src/lib/ae_journals/ae_journals_stores.ts @@ -30,6 +30,19 @@ let journals_local_data_struct: key_val = { journal: { edit: false, edit_kv: {}, + + type_code_li: [ + { code: 'diary', name: 'Diary' }, + { code: 'log', name: 'Log' }, + { code: 'journal', name: 'Journal' }, + { code: 'notebook', name: 'Notebook' }, + { code: 'personal', name: 'Personal' }, + { code: 'professional', name: 'Professional' }, + { code: 'tracking', name: 'Tracking' }, + { code: 'other', name: 'Other' }, + { code: 'test', name: 'Test' }, + // { code: 'notepad', name: 'Notepad' }, + ], }, entry: { edit: false, @@ -69,10 +82,14 @@ let journals_session_data_struct: key_val = { new_journal_name: '', new_journal_type_code: '', + + tmp_obj: {}, }, entry: { edit: false, edit_kv: {}, + + tmp_obj: {}, }, }; // console.log(`AE Stores - App Journals Session Storage Data:`, journals_session_data_struct); @@ -91,6 +108,9 @@ let journals_slct_obj_template: key_val = { 'journal_obj': {}, 'journal_obj_li': [], + 'tmp_journal_obj': {}, // Temporary object for new journal + 'tmp_journal_entry_obj': {}, // Temporary object for new journal entry + 'lq__journal_obj': {}, // Testing passing a LiveQuery object around... }; // console.log(`AE Stores - Selected Journals Objects:`, journals_slct_obj_template); @@ -103,10 +123,8 @@ export let journals_slct = writable(journals_slct_obj_template); // Intended for temporary session storage. // Updated 2025-03-16 let journals_trig_template: key_val = { - archive_id: false, - archive_content_li: false, - event_id: false, - post_id: false, + journal_id: false, + journal_entry_li: false, }; export let journals_trig: any = writable(journals_trig_template); // console.log(`AE Journals Stores - Journals Trigger:`, journals_trig); @@ -116,10 +134,7 @@ export let journals_trig: any = writable(journals_trig_template); // Intended for temporary session storage. // Updated 2025-03-16 let journals_prom_template: key_val = { - archive_id: false, - archive_content_li: false, - event_id: false, - post_id: false, -}; + journal_id: false, + journal_entry_li: false,}; export let journals_prom: any = writable(journals_prom_template); // console.log(`AE Journals Stores - Journals Trigger:`, journals_prom); diff --git a/src/lib/ae_journals/db_journals.ts b/src/lib/ae_journals/db_journals.ts index e6c12d55..fff06330 100644 --- a/src/lib/ae_journals/db_journals.ts +++ b/src/lib/ae_journals/db_journals.ts @@ -63,6 +63,9 @@ export interface Journal { passcode_write?: null|string; passcode_write_expire?: null|Date + passcode?: null|string; + passcode_timeout?: null|number; // Timeout in seconds + enable: null|boolean; hide?: null|boolean; priority?: null|boolean diff --git a/src/routes/journals/+page.svelte b/src/routes/journals/+page.svelte index 3345e67b..d040d61e 100644 --- a/src/routes/journals/+page.svelte +++ b/src/routes/journals/+page.svelte @@ -3,12 +3,17 @@ let log_lvl: number = 0; // console.log(`ae_journals +page data:`, data); // console.log(`ae_journals Data Params:`, data.url.searchParams.get('journal_id')); +// *** Import Svelte specific import { onMount } from 'svelte'; import { goto } from '$app/navigation'; -import { FolderPlus } from '@lucide/svelte'; -// import { api } from '$lib/api'; +// *** Import other supporting libraries +import { FolderPlus } from '@lucide/svelte'; import { liveQuery } from "dexie"; +import { Modal } from 'flowbite-svelte'; + +// *** Import Aether specific variables and functions +// import { api } from '$lib/api'; import { db_journals } from "$lib/ae_journals/db_journals"; import { journals_func } from '$lib/ae_journals/ae_journals_functions'; import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; @@ -211,6 +216,14 @@ async function create_journal() { {#if $journals_sess.show__modal_new__journal_obj} +

Create New Journal

@@ -226,6 +239,8 @@ async function create_journal() {
+ + {/if} diff --git a/src/routes/journals/[journal_id]/+layout.svelte b/src/routes/journals/[journal_id]/+layout.svelte index 0f4e47bb..ce97b294 100644 --- a/src/routes/journals/[journal_id]/+layout.svelte +++ b/src/routes/journals/[journal_id]/+layout.svelte @@ -5,9 +5,10 @@ let log_lvl: number = 0; let { data, children } = $props(); import { goto } from '$app/navigation'; -import { BookHeart, FilePlus } from '@lucide/svelte'; +import { BookHeart, Check, FilePlus, Minus, Notebook, Pencil, Plus, X } from '@lucide/svelte'; import { liveQuery } from "dexie"; +import { Modal } from 'flowbite-svelte'; import { ae_util } from '$lib/ae_utils/ae_utils'; import { db_journals } from "$lib/ae_journals/db_journals"; @@ -41,6 +42,49 @@ let lq__journal_obj = $derived(liveQuery(async () => { return results; })); + +async function handle_update_journal() { + if ($journals_slct.tmp_journal_obj.name && $journals_slct.tmp_journal_obj.type_code) { + try { + let data_kv = { + // account: $slct.account_id, + name: $journals_slct.tmp_journal_obj.name, + type_code: $journals_slct.tmp_journal_obj.type_code, + passcode: $journals_slct.tmp_journal_obj.passcode, + passcode_timeout: $journals_slct.tmp_journal_obj.passcode_timeout, + + cfg_json: $journals_slct.tmp_journal_obj.cfg_json + + }; + 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((results) => { + console.log('Journal updated:', results); + // $journals_slct.journal_id = results?.journal_id_random; + }).catch((error) => { + console.error('Error updating journal:', error); + alert('Failed to update journal.'); + }).finally(() => { + if ($journals_slct.journal_id) { + $journals_sess.show__modal_new__journal_obj = false; + // goto(`/journals/${$journals_slct.journal_id}`); + } + }); + // console.log('New journal updated:', result); + // $journals_sess.show__modal_new__journal_obj = false; + // goto(`/journals/${result.journal_id_random}`); + } catch (error) { + console.error('Error updating journal:', error); + alert('Failed to update journal.'); + } + } else { + alert('Please provide both name and type for the journal.'); + } +} + @@ -59,11 +103,13 @@ let lq__journal_obj = $derived(liveQuery(async () => {
+ class=" + btn btn-sm + variant-ghost-tertiary + hover:variant-filled-tertiary + transition + " + > @@ -71,14 +117,43 @@ let lq__journal_obj = $derived(liveQuery(async () => { {#if $journals_slct?.journal_entry_id} - - + + Back to Journal Entries + {:else} + + {/if} @@ -87,12 +162,7 @@ let lq__journal_obj = $derived(liveQuery(async () => { New entry: --> +
+ {/each} + + + + + + + + +
+ + +
+ + + +{/if}