From 15cb0aa0c51e1033e9f6ac3ba9a11d03dddb34bf Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Wed, 30 Apr 2025 17:30:06 -0400 Subject: [PATCH] Got themes working again. --- src/lib/ae_journals/ae_journals__journal.ts | 4 +- src/lib/ae_journals/db_journals.ts | 4 +- src/lib/ae_stores.ts | 2 +- src/lib/element_app_cfg.svelte | 56 +------- src/lib/element_theme.svelte | 129 ++++++++++++++++++ .../journals/[journal_id]/+layout.svelte | 103 +++++++++----- .../ae_comp__journal_entry_obj_id_view.svelte | 4 + .../ae_comp__journal_entry_obj_li.svelte | 23 +++- .../ae_comp__journal_obj_id_view.svelte | 7 +- 9 files changed, 238 insertions(+), 94 deletions(-) create mode 100644 src/lib/element_theme.svelte diff --git a/src/lib/ae_journals/ae_journals__journal.ts b/src/lib/ae_journals/ae_journals__journal.ts index fcda9eeb..cbd22a4a 100644 --- a/src/lib/ae_journals/ae_journals__journal.ts +++ b/src/lib/ae_journals/ae_journals__journal.ts @@ -591,9 +591,11 @@ export function db_save_ae_obj_li__journal( passcode_write: obj.passcode_write, passcode_write_expire: obj.passcode_write_expire, - passcode: obj.passcode, + passcode: obj.passcode, // For Journal Entry encryption password passcode_timeout: obj.passcode_timeout, + auth_key: obj.auth_key, // For Journal authorization without sign in + enable: obj.enable, hide: obj.hide, priority: obj.priority, diff --git a/src/lib/ae_journals/db_journals.ts b/src/lib/ae_journals/db_journals.ts index 99a673bd..503bd65a 100644 --- a/src/lib/ae_journals/db_journals.ts +++ b/src/lib/ae_journals/db_journals.ts @@ -68,9 +68,11 @@ export interface Journal { passcode_write?: null|string; passcode_write_expire?: null|Date - passcode?: null|string; + passcode?: null|string; // For Journal Entry encryption password passcode_timeout?: null|number; // Timeout in seconds + auth_key?: null|string; // For Journal authorization without sign in + enable: null|boolean; hide?: null|boolean; archive?: null|boolean; // Archive the journal diff --git a/src/lib/ae_stores.ts b/src/lib/ae_stores.ts index aff57f76..6813da1a 100644 --- a/src/lib/ae_stores.ts +++ b/src/lib/ae_stores.ts @@ -48,7 +48,7 @@ export let ae_snip = string_snippets; // Set the version for the app data. Changing this should force a notification and ask the user to clear and reload the page. let ver = '2025-04-30_1320'; // KEEP: 2025-04-18_1335 and 2025-04-29_1545 -let ver_idb = '2025-04-18_1100'; // Not used +let ver_idb = '2025-04-18_1100'; // Not currently used // *** BEGIN *** Longer-term app data. This should be stored to local storage. const ae_app_local_data_defaults: key_val = { diff --git a/src/lib/element_app_cfg.svelte b/src/lib/element_app_cfg.svelte index 4e43576a..05fe32aa 100644 --- a/src/lib/element_app_cfg.svelte +++ b/src/lib/element_app_cfg.svelte @@ -5,6 +5,8 @@ import { RadioGroup, RadioItem } from '@skeletonlabs/skeleton'; import { ae_util } from '$lib/ae_utils/ae_utils'; import { ae_loc, ae_sess, ae_api, slct, slct_trigger } from '$lib/ae_stores'; +import Element_theme from '$lib/element_theme.svelte'; + let notes: null|string = null; let all: boolean = false; @@ -159,57 +161,11 @@ function handle_clear_storage(item: null|string) { + -
-

Theme:

-
- - - { - $slct_trigger = 'set_theme_mode'; - }} - bind:group={$ae_loc.app_cfg.theme_mode} - name="theme_light" - value={'light'} - > - Light - - { - $slct_trigger = 'set_theme_mode'; - }} - bind:group={$ae_loc.app_cfg.theme_mode} - name="theme_dark" - value={'dark'} - > - Dark - - -
- -
- - -
-
diff --git a/src/lib/element_theme.svelte b/src/lib/element_theme.svelte new file mode 100644 index 00000000..1aa6a8b0 --- /dev/null +++ b/src/lib/element_theme.svelte @@ -0,0 +1,129 @@ + + + + +
+ + +
+ + +
+

Theme:

+
+ + + { + $slct_trigger = 'set_theme_mode'; + }} + bind:group={$ae_loc.theme_mode} + name="theme_light" + value={'light'} + > + Light + + { + $slct_trigger = 'set_theme_mode'; + }} + bind:group={$ae_loc.theme_mode} + name="theme_dark" + value={'dark'} + > + Dark + + +
+ +
+ + +
+
\ No newline at end of file diff --git a/src/routes/journals/[journal_id]/+layout.svelte b/src/routes/journals/[journal_id]/+layout.svelte index 35756de5..1fddfa2e 100644 --- a/src/routes/journals/[journal_id]/+layout.svelte +++ b/src/routes/journals/[journal_id]/+layout.svelte @@ -84,6 +84,7 @@ async function handle_update_journal() { 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, + auth_key: $journals_slct.tmp_journal_obj.auth_key, // The Journal Entry encryption password cfg_json: $journals_slct.tmp_journal_obj.cfg_json @@ -198,6 +199,7 @@ async function handle_update_journal() { type_code: $lq__journal_obj?.type_code, passcode: $lq__journal_obj?.passcode, passcode_timeout: $lq__journal_obj?.passcode_timeout, + auth_key: $lq__journal_obj?.auth_key, cfg_json: $lq__journal_obj?.cfg_json }; $journals_sess.show__modal_edit__journal_obj = true; @@ -329,62 +331,93 @@ async function handle_update_journal() { class="top-center bg-white dark:bg-gray-800 text-gray-800 dark:text-gray-200 rounded-lg border-gray-200 dark:border-gray-700 divide-gray-200 dark:divide-gray-700 shadow-md relative flex flex-col mx-auto w-full divide-y" >