') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ', 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); })(); Merge pull request #6 from CraigBuckmaster/master by CraigBuckmaster · Pull Request #7 · CraigBuckmaster/ScriptureDeepDive · GitHub
Skip to content

Merge pull request #6 from CraigBuckmaster/master - #7

Merged
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters
Mar 13, 2026
Merged

Merge pull request #6 from CraigBuckmaster/master#7
CraigBuckmaster merged 1 commit into
masterfrom
codex/review-recent-master-push-for-genesis-chapters

Conversation

@CraigBuckmaster

@CraigBuckmasterCraigBuckmaster commented Mar 13, 2026

Copy link
Copy Markdown
Owner

Merge pull request #5 from CraigBuckmaster/codex/review-recent-master…

@CraigBuckmaster
Merge pull request#6from CraigBuckmaster/master
1d95d03
Merge pull request #5 from CraigBuckmaster/codex/review-recent-master…
@CraigBuckmaster
CraigBuckmaster merged commit a5668fa into masterMar 13, 2026
@CraigBuckmaster
CraigBuckmaster deleted the codex/review-recent-master-push-for-genesis-chapters branch March 19, 2026 18:47
CraigBuckmaster pushed a commit that referenced this pull request Mar 25, 2026
Craig Buckmaster
P2: font tokens, StyleSheet extraction, unicode arrows, loading skele…
ff0dc99
…tons
All 4 P2 items from UI_UX_AUDIT.md resolved in one pass:
1. FONT FAMILY STRING LITERALS (#5): 194 raw string literals replaced
with fontFamily.* tokens across 57 files. fontFamily import added
to 56 files that were missing it. Zero string literals remain.
2. STYLESHEET EXTRACTION (#6): All 14 remaining screens now use
StyleSheet.create(). Every screen in the app is extracted.
- Full rewrites: BookIntroScreen, PersonDetailScreen,
ParallelPassageScreen, PlanDetailScreen, ScholarBioScreen,
WordStudyDetailScreen, BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, ScholarBrowseScreen, WordStudyBrowseScreen
- Partial extraction: GenealogyTreeScreen, MapScreen, TimelineScreen
3. UNICODE BACK ARROWS (#4): All 3 screens (BookIntroScreen,
ParallelPassageScreen, PersonDetailScreen) now use ScreenHeader
with Lucide ArrowLeft instead of text '← Back'.
4. LOADING SKELETONS (#7): All 3 blank-loading screens now show
LoadingSkeleton shimmer (PlanDetailScreen, ScholarBioScreen,
WordStudyDetailScreen). BookIntroScreen and PersonDetailScreen
also upgraded from blank View to LoadingSkeleton.
Bonus: ScholarBrowseScreen and WordStudyBrowseScreen gained
ScreenHeader back buttons (were missing from P1 scope since they
weren't in the audit's list of 6).
Files: 59 changed, +1320/-599
CraigBuckmaster added a commit that referenced this pull request Mar 29, 2026
@CraigBuckmaster
Merge pull request#7from CraigBuckmaster/codex/review-recent-master…
5d9582c
…-push-for-genesis-chapters
Merge pull request #6 from CraigBuckmaster/master
CraigBuckmaster pushed a commit that referenced this pull request Mar 29, 2026
Craig Buckmaster
P2: font tokens, StyleSheet extraction, unicode arrows, loading skele…
081e485
…tons
All 4 P2 items from UI_UX_AUDIT.md resolved in one pass:
1. FONT FAMILY STRING LITERALS (#5): 194 raw string literals replaced
with fontFamily.* tokens across 57 files. fontFamily import added
to 56 files that were missing it. Zero string literals remain.
2. STYLESHEET EXTRACTION (#6): All 14 remaining screens now use
StyleSheet.create(). Every screen in the app is extracted.
- Full rewrites: BookIntroScreen, PersonDetailScreen,
ParallelPassageScreen, PlanDetailScreen, ScholarBioScreen,
WordStudyDetailScreen, BookmarkListScreen, ReadingHistoryScreen,
PlanListScreen, ScholarBrowseScreen, WordStudyBrowseScreen
- Partial extraction: GenealogyTreeScreen, MapScreen, TimelineScreen
3. UNICODE BACK ARROWS (#4): All 3 screens (BookIntroScreen,
ParallelPassageScreen, PersonDetailScreen) now use ScreenHeader
with Lucide ArrowLeft instead of text '← Back'.
4. LOADING SKELETONS (#7): All 3 blank-loading screens now show
LoadingSkeleton shimmer (PlanDetailScreen, ScholarBioScreen,
WordStudyDetailScreen). BookIntroScreen and PersonDetailScreen
also upgraded from blank View to LoadingSkeleton.
Bonus: ScholarBrowseScreen and WordStudyBrowseScreen gained
ScreenHeader back buttons (were missing from P1 scope since they
weren't in the audit's list of 6).
Files: 59 changed, +1320/-599
This was referenced Apr 15, 2026
Open
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
CraigBuckmaster pushed a commit that referenced this pull request Apr 23, 2026
@claude
fix: address review comments on guided study v1
53f4932
Blockers:
#1 userDatabase.ts v6 migration — add prominent SQL-quoting warning
comment explaining why JSON.stringify + single-quoted SQL literal is
safe, so future edits don't break it
#2 review.ts / userMutations.ts — spaced repetition was pre-creating all
4 interval rows (1/3/7/30d) up front, causing users to see 3 copies
of each prompt between day 7 and day 30. Now schedules ONE row at
interval 1; completeGuidedReviewItem inserts the next-interval row
in the same transaction via new nextIntervalAfter() helper
#3 build_sqlite_loaders.py — proof_text_guards loader was silently
falling back to guard's own book/chapter on missing suggested_chapter.
Now raises ValueError with the offending guard ref. (Note: self-reference
itself is valid — it's the UX for 'read in full chapter context' — so
equal values are allowed, only missing/malformed values fail)
#4 guidedStudy.test.ts — fixture used 'at_a_glance: [...] as any' which
disabled TS checking. Replaced with correctly-typed ParsedBookIntro
containing a full BookIntroAtAGlance object, so the bookIntro code
path in buildConceptChips is now actually exercised
#5 userDatabase.ts — new migration v20 adds partial unique index on
guided_study_sessions(chapter_id) WHERE status='active' to prevent
session leaks from crashes between insert and status flip. Migration
dedupes any existing duplicates to the most recently updated row first
Nits:
#7 types/user.ts — export GUIDED_STUDY_STEPS const; derive GuidedStudyStep
type from it; add GUIDED_STUDY_STEP_LABELS map in guidedStudy/types.ts;
StudySessionStepper consumes both. Migration SQL CHECK gets a comment
pointing at the const as single source of truth
#8 plan.ts — CONCEPT_WORDS and genrePrompt refactored; concepts gets
TODO(#1584); genrePrompt switched from label.includes(...) substring
match to exact Record<label,prompt> lookup (with fallback for unknown
genres). Filed #1584 to migrate concepts to content/meta/concepts.json
#9 ChapterScreen.tsx + navigation/types.ts — added TODO(#1585) comments
around the nav escape hatch. Filed #1585 to track typed CrossTabNavProp
#10 StudySessionScreen.tsx — Amicus seed query fields now truncated to
200 chars with ellipsis sentinel so long syntheses don't blow past
the peek sheet or Amicus's seed-query limit
#12 .gitattributes — added '* text=auto eol=lf' + binary asset list.
Normalized CRLF → LF on translations.json and db-manifest.json
Deferred (filed/noted separately):
#6 EraTimeline RAF cleanup — legit scope creep, but splitting now is
more ceremony than benefit for a solo-dev PR. Kept bundled
#11 GoldStripeListItem primitive — real refactor opportunity touching
5 components; out of scope for a review-response commit
Tracking issues: #1584 (concepts from meta), #1585 (typed CrossTabNavProp)
@CraigBuckmasterCraigBuckmaster mentioned this pull request Apr 25, 2026
Open
25 tasks
@CraigBuckmasterCraigBuckmaster mentioned this pull request Jul 2, 2026
Closed
5 tasks
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@CraigBuckmaster