From 38e88d7b270b13ebc84f64797ce16908b63b38e1 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Thu, 19 Jun 2025 15:05:15 -0400 Subject: [PATCH] More updates everywhere related to TW v4 --- src/app.css | 12 +++++++ src/app.html | 2 +- src/lib/ae_idaa_stores.ts | 8 +++++ src/lib/ae_stores.ts | 2 +- src/lib/e_app_clipboard.svelte | 7 ++-- src/lib/e_app_theme.svelte | 14 ++++++-- src/routes/+layout.svelte | 5 +++ .../presenter/[presenter_id]/+page.svelte | 18 ++++++++-- .../[presenter_id]/presenter_view.svelte | 12 +++++-- .../ae_comp__event_session_poc_profile.svelte | 21 ++++++++++-- .../session/[session_id]/session_view.svelte | 7 ++-- .../(idaa)/archives/[archive_id]/+page.svelte | 34 ------------------- 12 files changed, 90 insertions(+), 52 deletions(-) diff --git a/src/app.css b/src/app.css index a09a3424..08f16f67 100644 --- a/src/app.css +++ b/src/app.css @@ -6,8 +6,17 @@ /* Register Preset Themes */ /* @import '@skeletonlabs/skeleton/themes/{theme-name}'; */ @import '@skeletonlabs/skeleton/themes/cerberus'; +@import '@skeletonlabs/skeleton/themes/concord'; +@import '@skeletonlabs/skeleton/themes/crimson'; +@import '@skeletonlabs/skeleton/themes/hamlindigo'; @import '@skeletonlabs/skeleton/themes/modern'; +@import '@skeletonlabs/skeleton/themes/nouveau'; +@import '@skeletonlabs/skeleton/themes/rocket'; +@import '@skeletonlabs/skeleton/themes/terminus'; +@import '@skeletonlabs/skeleton/themes/vintage'; @import '@skeletonlabs/skeleton/themes/wintry'; +/* @import '@skeletonlabs/skeleton/themes/ae_c_osit'; */ +/* @import '@skeletonlabs/skeleton/themes/ae_c_lci'; */ @source '../node_modules/@skeletonlabs/skeleton-svelte/dist'; @@ -30,6 +39,9 @@ /* @import '@fontsource/open-sans'; */ +/* https://www.skeleton.dev/docs/guides/cookbook/light-switch */ +/* @custom-variant dark (&:where([data-mode="dark"], [data-mode="dark"] *)); */ + @layer base { :root { diff --git a/src/app.html b/src/app.html index b7a6ba86..fc476c1d 100644 --- a/src/app.html +++ b/src/app.html @@ -1,5 +1,5 @@ - + diff --git a/src/lib/ae_idaa_stores.ts b/src/lib/ae_idaa_stores.ts index 9e33d6a5..966ddaa1 100644 --- a/src/lib/ae_idaa_stores.ts +++ b/src/lib/ae_idaa_stores.ts @@ -100,15 +100,23 @@ let idaa_session_data_struct: key_val = { archives: { qry__status: null, + show__modal_edit__archive_id: null, + show__modal_view__archive_id: null, + show__modal_edit__archive_content_id: null, + show__modal_view__archive_content_id: null, }, bb: { qry__status: null, + show__inline_edit__post_obj: null, + show__modal_edit__post_id: null, + show__modal_view__post_id: null, }, recovery_meetings: { qry__status: null, // qry__fulltext_str: null, + status_qry__last_request_str: null, show__modal_edit: false, show__modal_view: false, diff --git a/src/lib/ae_stores.ts b/src/lib/ae_stores.ts index acba1441..0b413938 100644 --- a/src/lib/ae_stores.ts +++ b/src/lib/ae_stores.ts @@ -63,7 +63,7 @@ const ae_app_local_data_defaults: key_val = { name: 'Aether - App Hub (SvelteKit 2.x Svelte 4.x)', theme: 'light', theme_mode: 'light', - theme_name: 'wintry', // wintry + theme_name: 'nouveau', // wintry iframe: false, title: `OSIT's Æ`, // - Dev SvelteKit`, // Æ diff --git a/src/lib/e_app_clipboard.svelte b/src/lib/e_app_clipboard.svelte index 452e57d3..b4315107 100644 --- a/src/lib/e_app_clipboard.svelte +++ b/src/lib/e_app_clipboard.svelte @@ -3,8 +3,8 @@ interface Props { log_lvl?: number; value: any; - success: boolean; - btn_text: string; + success?: boolean; + btn_text?: string; btn_title?: string; btn_class?: string; } @@ -43,6 +43,7 @@ const elemButton: HTMLButtonElement | null = document.querySelector('[data-butto diff --git a/src/lib/e_app_theme.svelte b/src/lib/e_app_theme.svelte index f8d46f9b..29579c30 100644 --- a/src/lib/e_app_theme.svelte +++ b/src/lib/e_app_theme.svelte @@ -118,9 +118,12 @@ if ($ae_loc.app_cfg.theme_mode == 'light') { console.log(`$ae_loc?.theme_name=${$ae_loc?.theme_name}`); // $slct_trigger = null; // Update the body attribute named "data-theme" to the current theme name. - document.body.setAttribute('data-theme', new_theme_name); + // document.body.setAttribute('data-theme', new_theme_name); // document.body.setAttribute('data-theme', $ae_loc?.theme_name); + // NEW for Tailwind v4: Update the html attribute named "data-theme" to the current theme name. + document.documentElement.setAttribute('data-theme', new_theme_name); + // if ($ae_loc.theme_mode == 'light') { // document.documentElement.classList.remove('dark'); // document.documentElement.classList.add('light'); @@ -134,11 +137,18 @@ if ($ae_loc.app_cfg.theme_mode == 'light') { title="Theme name" > - + + + + + + + + diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index d44928c4..a03553a9 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -381,6 +381,11 @@ if ($ae_loc?.site_access_key || $ae_loc?.site_domain_access_key) { // Root Svelte Layout Specific: let trigger_clear_access: null|boolean = $state(null); +if (browser) { + document.documentElement.setAttribute('data-theme', $ae_loc?.theme_name ?? 'nouveau'); + // cerberus +} + // $effect(() => { if (browser && flag_reload) { if (log_lvl) { diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte index 7cb57a35..00bbee4b 100644 --- a/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte +++ b/src/routes/events/[event_id]/presenter/[presenter_id]/+page.svelte @@ -22,6 +22,7 @@ import Element_manage_event_file_li_wrap from '$lib/element_manage_event_file_li import Comp_event_presenter_form_agree from './ae_comp__event_presenter_form_agree.svelte'; import Presenter_view from './presenter_view.svelte'; import Presenter_page_menu from './presenter_page_menu.svelte'; +import MyClipboard from '$lib/e_app_clipboard.svelte'; // Exports // export let display_mode: string = 'default'; // 'default', 'compact', 'minimal', 'launcher' @@ -188,7 +189,7 @@ if (!$ae_loc.authenticated_access && $events_loc.pres_mgmt.show_content__present {#if $lq__event_presenter_obj.person_id && $ae_loc.trusted_access} - + --> + + {#snippet btn_text()} + + Copy Access Link + {/snippet} + + + {/if} {#if $events_loc.pres_mgmt?.require__presenter_agree diff --git a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte index 029850dc..00f46c89 100644 --- a/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte +++ b/src/routes/events/[event_id]/presenter/[presenter_id]/presenter_view.svelte @@ -11,6 +11,7 @@ import { ae_util } from '$lib/ae_utils/ae_utils'; // import { api } from '$lib/api'; import Element_ae_crud from '$lib/element_ae_crud.svelte'; // import Element_data_store from '$lib/element_data_store_v2.svelte'; +import MyClipboard from '$lib/e_app_clipboard.svelte'; import { core_func } from '$lib/ae_core/ae_core_functions'; import { ae_snip, ae_loc, ae_sess, ae_api, ae_trig, slct, slct_trigger } from '$lib/ae_stores'; @@ -1432,7 +1433,7 @@ $: if ($lq__event_presenter_obj) { class:hidden={$events_loc.pres_mgmt?.hide__presenter_biography || (!$ae_loc.authenticated_access && !$lq__event_presenter_obj.biography)} >
- + --> + +