diff --git a/package-lock.json b/package-lock.json index c72c7fb4..7ab18095 100644 --- a/package-lock.json +++ b/package-lock.json @@ -87,7 +87,7 @@ "tailwindcss-animate": "^1.0.7", "tslib": "^2.4.1", "typescript": "^5.0.0", - "typescript-svelte-plugin": "^0.3.45", + "typescript-svelte-plugin": "^0.3.46", "vite": "^6.0.0", "vite-plugin-tailwind-purgecss": "^0.3.3", "vitest": "^3.0.0" diff --git a/package.json b/package.json index 46b64f96..dec6f42c 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "tailwindcss-animate": "^1.0.7", "tslib": "^2.4.1", "typescript": "^5.0.0", - "typescript-svelte-plugin": "^0.3.45", + "typescript-svelte-plugin": "^0.3.46", "vite": "^6.0.0", "vite-plugin-tailwind-purgecss": "^0.3.3", "vitest": "^3.0.0" diff --git a/src/lib/ae_journals/ae_journals__journal_entry.ts b/src/lib/ae_journals/ae_journals__journal_entry.ts index 3dc3cbc5..2b45a831 100644 --- a/src/lib/ae_journals/ae_journals__journal_entry.ts +++ b/src/lib/ae_journals/ae_journals__journal_entry.ts @@ -338,6 +338,9 @@ export async function db_save_ae_obj_li__journal_entry( console.log(`ae_obj ${obj_type}:`, obj); } + let content = obj.content ?? ''; + let content_md_html: null|string = marked.parse(content); + try { const id_random = await db_journals.journal_entry.put({ id: obj.journal_entry_id_random, @@ -371,7 +374,7 @@ export async function db_save_ae_obj_li__journal_entry( // description: obj.description, content: obj.content, - content_md_html: marked.parse(obj.content), + content_md_html: content_md_html, content_html: obj.content_html, content_json: obj.content_json, diff --git a/src/routes/journals/[journal_id]/+layout.svelte b/src/routes/journals/[journal_id]/+layout.svelte index bba758e7..cdd3da5c 100644 --- a/src/routes/journals/[journal_id]/+layout.svelte +++ b/src/routes/journals/[journal_id]/+layout.svelte @@ -44,9 +44,20 @@ let lq__journal_obj = $derived(liveQuery(async () => { +
-
+
+ + Back to Journal Entries + + {/if} +
\ No newline at end of file diff --git a/src/routes/journals/[journal_id]/+layout.ts b/src/routes/journals/[journal_id]/+layout.ts new file mode 100644 index 00000000..296b4a63 --- /dev/null +++ b/src/routes/journals/[journal_id]/+layout.ts @@ -0,0 +1,46 @@ +/** @type {import('./$types').LayoutLoad} */ +console.log(`ae_l_journals [journal_id] +layout.ts start`); + +import { browser } from '$app/environment'; +import { journals_func } from '$lib/ae_journals/ae_journals_functions'; + +export async function load({ params, parent }) { + let log_lvl: number = 1; + + let data = await parent(); + data.log_lvl = log_lvl; + + let account_id = data.account_id; + let ae_acct = data[account_id]; + + let journal_id = params.journal_id; + if (!journal_id) { + console.log(`ae_journals journals [journal_id] +page.ts: The journal_id was not found in the params!!!`); + error(404, { + message: 'Journals - Journal ID not found' + }); + } + ae_acct.slct.journal_id = journal_id; + console.log(`ae_journals journals [journal_id] +page.ts: journal_id = `, ae_acct.slct.journal_id); + + if (browser) { + if (log_lvl) { + console.log(`ae_journals journals [journal_id] +page.ts: journal_id = `, journal_id); + } + // Load event journal object + let load_journal_obj = journals_func.load_ae_obj_id__journal({ + api_cfg: ae_acct.api, + journal_id: journal_id, + inc_entry_li: true, + try_cache: true, + log_lvl: log_lvl + }); + + ae_acct.slct.journal_obj = load_journal_obj; + } + + // WARNING: Precaution against shared data between sites. + data[account_id] = ae_acct; + + return data; +} diff --git a/src/routes/journals/[journal_id]/+page.svelte b/src/routes/journals/[journal_id]/+page.svelte index 7cc07dc4..50dd8e60 100644 --- a/src/routes/journals/[journal_id]/+page.svelte +++ b/src/routes/journals/[journal_id]/+page.svelte @@ -50,6 +50,7 @@ if (log_lvl) { $journals_slct.journal_id = ae_acct.slct.journal_id; // $journals_slct.journal_obj = ae_acct.slct.journal_obj; +$journals_slct.journal_entry_id = null; let lq__journal_obj = $derived(liveQuery(async () => { if (log_lvl) { @@ -154,7 +155,7 @@ if (browser) { -
+ > --> -
+