From f155a679c3d4a3e172929f4e00e8aee308508f57 Mon Sep 17 00:00:00 2001 From: linearcombination <4829djaskdfj@gmail.com> Date: Thu, 26 Jun 2025 09:59:39 -0700 Subject: [PATCH 1/4] Refactor css to resolve (most) svelte css compiler warnings --- frontend/src/routes/+layout.svelte | 25 ++++++++++ frontend/src/routes/books/+page.svelte | 15 ++---- frontend/src/routes/languages/+page.svelte | 49 ------------------- frontend/src/routes/passages/+layout.svelte | 7 --- .../src/routes/passages/language/+page.svelte | 49 ------------------- .../src/routes/passages/passages/+page.svelte | 28 ----------- .../src/routes/passages/settings/+page.svelte | 12 ----- .../src/routes/resource_types/+page.svelte | 12 ----- frontend/src/routes/settings/+page.svelte | 12 ----- frontend/src/routes/stet/+layout.svelte | 6 --- .../src/routes/stet/settings/+page.svelte | 12 ----- .../routes/stet/source_languages/+page.svelte | 49 ------------------- .../[lang0_code]/+page.svelte | 28 ----------- 13 files changed, 28 insertions(+), 276 deletions(-) diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte index 5e9ae8c4c..78e327160 100644 --- a/frontend/src/routes/+layout.svelte +++ b/frontend/src/routes/+layout.svelte @@ -14,4 +14,29 @@ margin-top: 12px; margin-left: 12px; } + + :global(li.target:has(input[type='checkbox']:checked)) { + background: #e6eefb; + } + :global(div.target:has(input[type='checkbox']:checked)) { + background: #e6eefb; + } + :global(div.target:has(input[type='radio']:checked)) { + background: #e6eefb; + } + :global(div.target2:has(input[type='checkbox']:checked) + div) { + color: #015ad9; + } + :global(div.target2:has(input[type='checkbox']:checked) + span) { + color: #015ad9; + } + :global(div.target3:has(input[type='checkbox']:checked) + span) { + color: #015ad9; + } + :global(input.checkbox-target[type='checkbox']:checked + span) { + color: #015ad9; + } + :global(.checkbox-style) { + @apply h-4 w-4 rounded border-gray-300 bg-gray-100 text-blue-600 focus:ring-2 focus:ring-blue-500 dark:border-gray-600 dark:bg-gray-700 dark:ring-offset-gray-800 dark:focus:ring-blue-600; + } diff --git a/frontend/src/routes/books/+page.svelte b/frontend/src/routes/books/+page.svelte index 1e5841510..03dc6802c 100644 --- a/frontend/src/routes/books/+page.svelte +++ b/frontend/src/routes/books/+page.svelte @@ -378,24 +378,15 @@ background-position: left center; outline: 0; } - div.target:has(input[type='checkbox']:checked) { + div.radio-target:has(input[type='radio']:checked) { background: #e6eefb; } - div.target:has(input[type='radio']:checked) { - background: #e6eefb; - } - input.checkbox-target[type='checkbox']:checked + span { + input#show-gateway-radio-button[type='radio']:checked + span { color: #015ad9; } - div.target3:has(input[type='checkbox']:checked) + span { + input#show-heart-radio-button[type='radio']:checked + span { color: #015ad9; } - div.target2:has(input[type='checkbox']:checked) + div { - color: #015ad9; - } - .checkbox-style { - @apply h-4 w-4 rounded border-gray-300 bg-gray-100 text-blue-600 focus:ring-2 focus:ring-blue-500 dark:border-gray-600 dark:bg-gray-700 dark:ring-offset-gray-800 dark:focus:ring-blue-600; - } .radio-style { @apply h-4 w-4 border-gray-300 bg-gray-100 text-blue-600 focus:ring-2 focus:ring-blue-500 dark:border-gray-600 dark:bg-gray-700 dark:ring-offset-gray-800 dark:focus:ring-blue-600; } diff --git a/frontend/src/routes/languages/+page.svelte b/frontend/src/routes/languages/+page.svelte index 0aaf71252..35429904e 100644 --- a/frontend/src/routes/languages/+page.svelte +++ b/frontend/src/routes/languages/+page.svelte @@ -215,52 +215,3 @@ - - diff --git a/frontend/src/routes/passages/+layout.svelte b/frontend/src/routes/passages/+layout.svelte index d8f66ca12..9858e3f9e 100644 --- a/frontend/src/routes/passages/+layout.svelte +++ b/frontend/src/routes/passages/+layout.svelte @@ -1,13 +1,6 @@ - diff --git a/frontend/src/routes/passages/language/+page.svelte b/frontend/src/routes/passages/language/+page.svelte index 0dc05061e..f6c5df2d1 100644 --- a/frontend/src/routes/passages/language/+page.svelte +++ b/frontend/src/routes/passages/language/+page.svelte @@ -168,52 +168,3 @@ - - diff --git a/frontend/src/routes/passages/passages/+page.svelte b/frontend/src/routes/passages/passages/+page.svelte index 4bbc58e73..707aae3a9 100644 --- a/frontend/src/routes/passages/passages/+page.svelte +++ b/frontend/src/routes/passages/passages/+page.svelte @@ -125,31 +125,3 @@ - - diff --git a/frontend/src/routes/passages/settings/+page.svelte b/frontend/src/routes/passages/settings/+page.svelte index 073fa3093..bf33f3f98 100644 --- a/frontend/src/routes/passages/settings/+page.svelte +++ b/frontend/src/routes/passages/settings/+page.svelte @@ -124,15 +124,3 @@ - - diff --git a/frontend/src/routes/resource_types/+page.svelte b/frontend/src/routes/resource_types/+page.svelte index 633d5ccff..03fd49a14 100644 --- a/frontend/src/routes/resource_types/+page.svelte +++ b/frontend/src/routes/resource_types/+page.svelte @@ -372,15 +372,3 @@ - - diff --git a/frontend/src/routes/settings/+page.svelte b/frontend/src/routes/settings/+page.svelte index d508b4131..03fd5c7e0 100644 --- a/frontend/src/routes/settings/+page.svelte +++ b/frontend/src/routes/settings/+page.svelte @@ -299,15 +299,3 @@ - - diff --git a/frontend/src/routes/stet/+layout.svelte b/frontend/src/routes/stet/+layout.svelte index d8f66ca12..cf3304ee8 100644 --- a/frontend/src/routes/stet/+layout.svelte +++ b/frontend/src/routes/stet/+layout.svelte @@ -5,9 +5,3 @@ - diff --git a/frontend/src/routes/stet/settings/+page.svelte b/frontend/src/routes/stet/settings/+page.svelte index 0ef0f615c..a780d0a49 100644 --- a/frontend/src/routes/stet/settings/+page.svelte +++ b/frontend/src/routes/stet/settings/+page.svelte @@ -126,15 +126,3 @@ - - diff --git a/frontend/src/routes/stet/source_languages/+page.svelte b/frontend/src/routes/stet/source_languages/+page.svelte index 68ea6653c..d6a7b83b7 100644 --- a/frontend/src/routes/stet/source_languages/+page.svelte +++ b/frontend/src/routes/stet/source_languages/+page.svelte @@ -203,52 +203,3 @@ - - diff --git a/frontend/src/routes/stet/target_languages/[lang0_code]/+page.svelte b/frontend/src/routes/stet/target_languages/[lang0_code]/+page.svelte index fa68c5711..489c053a9 100644 --- a/frontend/src/routes/stet/target_languages/[lang0_code]/+page.svelte +++ b/frontend/src/routes/stet/target_languages/[lang0_code]/+page.svelte @@ -188,31 +188,3 @@ - - From b8b26dd1e06c0493e4ec10f65d548b1610985cea Mon Sep 17 00:00:00 2001 From: linearcombination <4829djaskdfj@gmail.com> Date: Thu, 26 Jun 2025 10:02:47 -0700 Subject: [PATCH 2/4] Minor formatting --- .../src/routes/passages/passages/+page.svelte | 4 ---- .../passages/BibleReferenceSelector.svelte | 2 +- .../src/routes/passages/settings/+page.svelte | 5 +---- .../src/routes/stet/settings/+page.svelte | 1 - .../routes/stet/source_languages/+page.svelte | 20 +++++++++++-------- .../[lang0_code]/+page.svelte | 2 +- 6 files changed, 15 insertions(+), 19 deletions(-) diff --git a/frontend/src/routes/passages/passages/+page.svelte b/frontend/src/routes/passages/passages/+page.svelte index 707aae3a9..2eaf331eb 100644 --- a/frontend/src/routes/passages/passages/+page.svelte +++ b/frontend/src/routes/passages/passages/+page.svelte @@ -34,7 +34,6 @@ return bookCodesAndNames } - let bookCodesAndNames: Array<[string, string]> = [] onMount(() => { @@ -46,7 +45,6 @@ bookCodesAndNames = [...bookCodesAndNames_] // Ensure reactivity with [...blah] }) .catch((err) => console.error(err)) - }) function removePassage(id: number) { @@ -61,8 +59,6 @@ } } - - let windowWidth: number = typeof window !== 'undefined' ? window.innerWidth : 0 let TAILWIND_SM_MIN_WIDTH: number = PUBLIC_TAILWIND_SM_MIN_WIDTH as unknown as number diff --git a/frontend/src/routes/passages/passages/BibleReferenceSelector.svelte b/frontend/src/routes/passages/passages/BibleReferenceSelector.svelte index f2c56ee7f..dba2eb97e 100644 --- a/frontend/src/routes/passages/passages/BibleReferenceSelector.svelte +++ b/frontend/src/routes/passages/passages/BibleReferenceSelector.svelte @@ -5,7 +5,7 @@ import { PUBLIC_CHAPTERS_IN_BOOKS_URL, PUBLIC_NT_SURVEY_RG_PASSAGES_URL, - PUBLIC_STET_PASSAGES_URL, + PUBLIC_STET_PASSAGES_URL } from '$env/static/public' import { env } from '$env/dynamic/public' import type { BibleReference } from './model' diff --git a/frontend/src/routes/passages/settings/+page.svelte b/frontend/src/routes/passages/settings/+page.svelte index bf33f3f98..675274d6e 100644 --- a/frontend/src/routes/passages/settings/+page.svelte +++ b/frontend/src/routes/passages/settings/+page.svelte @@ -2,10 +2,7 @@ import WizardBreadcrumb from '$lib/passages/WizardBreadcrumb.svelte' import WizardBasket from '$lib/passages/WizardBasket.svelte' import WizardBasketModal from '$lib/WizardBasketModal.svelte' - import { - emailStore, - documentRequestKeyStore, - } from '$lib/passages/stores/SettingsStore' + import { emailStore, documentRequestKeyStore } from '$lib/passages/stores/SettingsStore' import { documentReadyStore, errorStore } from '$lib/passages/stores/NotificationStore' import { passagesStore } from '$lib/passages/stores/PassagesStore' import GenerateDocument from './GenerateDocument.svelte' diff --git a/frontend/src/routes/stet/settings/+page.svelte b/frontend/src/routes/stet/settings/+page.svelte index a780d0a49..0cc63e345 100644 --- a/frontend/src/routes/stet/settings/+page.svelte +++ b/frontend/src/routes/stet/settings/+page.svelte @@ -13,7 +13,6 @@ import LogRocket from 'logrocket' import CheckIcon from '$lib/CheckIcon.svelte' - $: showEmail = false $: showEmailCaptured = false $: $documentReadyStore = false diff --git a/frontend/src/routes/stet/source_languages/+page.svelte b/frontend/src/routes/stet/source_languages/+page.svelte index d6a7b83b7..6e3489ed1 100644 --- a/frontend/src/routes/stet/source_languages/+page.svelte +++ b/frontend/src/routes/stet/source_languages/+page.svelte @@ -81,8 +81,8 @@ let heartCodesAndNames: Array = [] async function loadSourceLangCodesAndNames() { try { - langCodeNameAndTypes = await getSourceLangCodesNames() - gatewayCodesAndNames = langCodeNameAndTypes + langCodeNameAndTypes = await getSourceLangCodesNames() + gatewayCodesAndNames = langCodeNameAndTypes .filter((element: [string, string, boolean]) => { return element[2] }) @@ -92,7 +92,7 @@ return !element[2] }) .map((tuple) => `${tuple[0]}, ${tuple[1]}`) - } catch(err) { + } catch (err) { console.error(err) } } @@ -123,8 +123,10 @@ let filteredGatewayCodeAndNames: Array = [] $: { if (gatewayCodesAndNames) { - filteredGatewayCodeAndNames = gatewayCodesAndNames.filter((item: string) => - getName(item.toLowerCase()).includes(gatewaySearchTerm.toLowerCase()) || getCode(item.toLowerCase()).includes(gatewaySearchTerm.toLowerCase()) + filteredGatewayCodeAndNames = gatewayCodesAndNames.filter( + (item: string) => + getName(item.toLowerCase()).includes(gatewaySearchTerm.toLowerCase()) || + getCode(item.toLowerCase()).includes(gatewaySearchTerm.toLowerCase()) ) } } @@ -134,13 +136,15 @@ let filteredHeartCodeAndNames: Array = [] $: { if (heartCodesAndNames) { - filteredHeartCodeAndNames = heartCodesAndNames.filter((item: string) => - getName(item.toLowerCase()).includes(heartSearchTerm.toLowerCase()) || getCode(item.toLowerCase()).includes(heartSearchTerm.toLowerCase()) + filteredHeartCodeAndNames = heartCodesAndNames.filter( + (item: string) => + getName(item.toLowerCase()).includes(heartSearchTerm.toLowerCase()) || + getCode(item.toLowerCase()).includes(heartSearchTerm.toLowerCase()) ) } } - let windowWidth: number = typeof window !== "undefined" ? window.innerWidth : 0 + let windowWidth: number = typeof window !== 'undefined' ? window.innerWidth : 0 $: console.log(`windowWidth: ${windowWidth}`) let TAILWIND_SM_MIN_WIDTH: number = PUBLIC_TAILWIND_SM_MIN_WIDTH as unknown as number diff --git a/frontend/src/routes/stet/target_languages/[lang0_code]/+page.svelte b/frontend/src/routes/stet/target_languages/[lang0_code]/+page.svelte index 489c053a9..8e43e70b5 100644 --- a/frontend/src/routes/stet/target_languages/[lang0_code]/+page.svelte +++ b/frontend/src/routes/stet/target_languages/[lang0_code]/+page.svelte @@ -125,7 +125,7 @@ ) } - let windowWidth: number = typeof window !== "undefined" ? window.innerWidth : 0 + let windowWidth: number = typeof window !== 'undefined' ? window.innerWidth : 0 $: console.log(`windowWidth: ${windowWidth}`) let TAILWIND_SM_MIN_WIDTH: number = PUBLIC_TAILWIND_SM_MIN_WIDTH as unknown as number From 8190eba98bfe197d456fa64d4e15c86e44b2aa2e Mon Sep 17 00:00:00 2001 From: linearcombination <4829djaskdfj@gmail.com> Date: Thu, 26 Jun 2025 10:06:49 -0700 Subject: [PATCH 3/4] Small simplification --- .../routes/passages/passages/BibleReferenceSelector.svelte | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/src/routes/passages/passages/BibleReferenceSelector.svelte b/frontend/src/routes/passages/passages/BibleReferenceSelector.svelte index dba2eb97e..7f1a47df6 100644 --- a/frontend/src/routes/passages/passages/BibleReferenceSelector.svelte +++ b/frontend/src/routes/passages/passages/BibleReferenceSelector.svelte @@ -64,11 +64,12 @@ export async function addNTSurveyRGPassages() { try { - const bibleReferences = await getNTSurveyRGPassages($langCodeAndNameStore.split(',')[0]) - console.log(`bibleReferences[0]: ${bibleReferences[0]}`) + langCode = $langCodeAndNameStore.split(',')[0] + const bibleReferences = await getNTSurveyRGPassages(langCode) + // console.log(`bibleReferences[0]: ${bibleReferences[0]}`) for (const bibleRef of bibleReferences) { addPassageReference( - $langCodeAndNameStore.split(',')[0], + langCode, bibleRef.book_code, bibleRef.book_name, Number(bibleRef.start_chapter), From 74b664c22ba25868aab566c8a8d1aad42b3a8803 Mon Sep 17 00:00:00 2001 From: linearcombination <4829djaskdfj@gmail.com> Date: Thu, 26 Jun 2025 10:31:44 -0700 Subject: [PATCH 4/4] Fix compile error --- .../passages/passages/BibleReferenceSelector.svelte | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/frontend/src/routes/passages/passages/BibleReferenceSelector.svelte b/frontend/src/routes/passages/passages/BibleReferenceSelector.svelte index 7f1a47df6..f75715370 100644 --- a/frontend/src/routes/passages/passages/BibleReferenceSelector.svelte +++ b/frontend/src/routes/passages/passages/BibleReferenceSelector.svelte @@ -64,9 +64,9 @@ export async function addNTSurveyRGPassages() { try { - langCode = $langCodeAndNameStore.split(',')[0] + const langCode = $langCodeAndNameStore.split(',')[0] const bibleReferences = await getNTSurveyRGPassages(langCode) - // console.log(`bibleReferences[0]: ${bibleReferences[0]}`) + console.log(`bibleReferences[0]: ${bibleReferences[0]}`) for (const bibleRef of bibleReferences) { addPassageReference( langCode, @@ -103,11 +103,12 @@ export async function addSTETPassages() { try { - const bibleReferences = await getSTETPassages($langCodeAndNameStore.split(',')[0]) + const langCode = $langCodeAndNameStore.split(',')[0] + const bibleReferences = await getSTETPassages(langCode) console.log(`bibleReferences[0]: ${bibleReferences[0]}`) for (const bibleRef of bibleReferences) { addPassageReference( - $langCodeAndNameStore.split(',')[0], + langCode, bibleRef.book_code, bibleRef.book_name, Number(bibleRef.start_chapter),