Add person field, full-text search, and search highlighting

- New 'Who are you praying for?' field on prayer cards (optional)
- Person name shown in primary color above the request text
- Search bar filters across person, request, answer, and tags simultaneously
- Search terms highlighted in yellow/amber in results
- Tag filter and search combine with status filter

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DReRqHxSYuVfCzTzQGD9hZ
This commit is contained in:
Claude committed 2026-07-18 23:32:37 +00:00
1 parent 8bda0b814c
commit af836d4ec9
4 files changed
+192 -34

No files matched your search

+107 -3
View File
@@ -181,13 +181,89 @@ body {
background: var(--surface-hover); background: var(--surface-hover);
} }
/* Person field */
.person-input {
width: 100%;
border: 1px solid var(--border);
border-radius: 6px;
padding: .5rem .75rem;
background: var(--bg);
color: var(--text);
font-family: inherit;
font-size: .95rem;
outline: none;
margin-bottom: .6rem;
transition: border-color .15s;
}
.person-input:focus { border-color: var(--primary); }
.person-input::placeholder { color: var(--text-muted); }
/* Toolbar: filter + search on one row */
.toolbar {
display: flex;
gap: .75rem;
align-items: center;
margin-bottom: 1rem;
flex-wrap: wrap;
}
/* Filter bar */ /* Filter bar */
.filter-bar { .filter-bar {
display: flex; display: flex;
gap: 0.5rem; gap: .5rem;
margin-bottom: 1rem;
} }
/* Search */
.search-wrap {
position: relative;
flex: 1;
min-width: 160px;
}
.search-icon {
position: absolute;
left: .6rem;
top: 50%;
transform: translateY(-50%);
color: var(--text-muted);
font-size: 1.1rem;
pointer-events: none;
line-height: 1;
}
.search-input {
width: 100%;
border: 1px solid var(--border);
border-radius: 20px;
padding: .38rem .75rem .38rem 1.9rem;
background: var(--surface);
color: var(--text);
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
font-size: .88rem;
outline: none;
transition: border-color .15s;
}
.search-input:focus { border-color: var(--primary); }
.search-input::placeholder { color: var(--text-muted); }
.search-clear {
position: absolute;
right: .5rem;
top: 50%;
transform: translateY(-50%);
background: none;
border: none;
color: var(--text-muted);
cursor: pointer;
font-size: .75rem;
padding: .2rem;
line-height: 1;
}
.search-clear:hover { color: var(--text); }
.filter-btn { .filter-btn {
padding: 0.4rem 0.9rem; padding: 0.4rem 0.9rem;
border-radius: 20px; border-radius: 20px;
@@ -388,10 +464,38 @@ body {
.status-dot.answered { background: var(--answered-dot); } .status-dot.answered { background: var(--answered-dot); }
.status-dot.archived { background: var(--text-muted); } .status-dot.archived { background: var(--text-muted); }
.card-text {
flex: 1;
display: flex;
flex-direction: column;
gap: .15rem;
}
.person-name {
font-size: .82rem;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', sans-serif;
font-weight: 600;
color: var(--primary);
letter-spacing: .01em;
}
mark.highlight {
background: #fde68a;
color: inherit;
border-radius: 2px;
padding: 0 1px;
}
@media (prefers-color-scheme: dark) {
mark.highlight { background: #78540a; }
}
:root[data-theme="dark"] mark.highlight { background: #78540a; }
:root[data-theme="light"] mark.highlight { background: #fde68a; }
.request-text { .request-text {
font-size: 0.97rem; font-size: 0.97rem;
line-height: 1.5; line-height: 1.5;
flex: 1;
} }
.card-meta { .card-meta {
+82 -30
View File
@@ -5,6 +5,21 @@ import './App.css';
type Filter = 'active' | 'answered' | 'all'; type Filter = 'active' | 'answered' | 'all';
function normalize(s: string) {
return s.toLowerCase().trim();
}
function matches(prayer: Prayer, query: string) {
const q = normalize(query);
if (!q) return true;
return (
normalize(prayer.person).includes(q) ||
normalize(prayer.request).includes(q) ||
normalize(prayer.answer).includes(q) ||
prayer.tags.some(t => normalize(t).includes(q))
);
}
export default function App() { export default function App() {
const { const {
prayers, prayers,
@@ -21,27 +36,29 @@ export default function App() {
const [filter, setFilter] = useState<Filter>('active'); const [filter, setFilter] = useState<Filter>('active');
const [activeTag, setActiveTag] = useState<string | null>(null); const [activeTag, setActiveTag] = useState<string | null>(null);
const [search, setSearch] = useState('');
const [newPerson, setNewPerson] = useState('');
const [newRequest, setNewRequest] = useState(''); const [newRequest, setNewRequest] = useState('');
const [newTags, setNewTags] = useState(''); const [newTags, setNewTags] = useState('');
const [expandedId, setExpandedId] = useState<string | null>(null); const [expandedId, setExpandedId] = useState<string | null>(null);
const [editingAnswer, setEditingAnswer] = useState<{ id: string; text: string } | null>(null); const [editingAnswer, setEditingAnswer] = useState<{ id: string; text: string } | null>(null);
const [writeError, setWriteError] = useState<string | null>(null); const [writeError, setWriteError] = useState<string | null>(null);
// All unique tags across all non-archived prayers
const allTags = useMemo(() => { const allTags = useMemo(() => {
const set = new Set<string>(); const set = new Set<string>();
prayers.filter(p => p.status !== 'archived').forEach(p => p.tags.forEach(t => set.add(t))); prayers.filter(p => p.status !== 'archived').forEach(p => p.tags.forEach(t => set.add(t)));
return Array.from(set).sort(); return Array.from(set).sort();
}, [prayers]); }, [prayers]);
const filtered = prayers.filter(p => { const filtered = useMemo(() => prayers.filter(p => {
const statusMatch = const statusMatch =
filter === 'active' ? p.status === 'active' : filter === 'active' ? p.status === 'active' :
filter === 'answered' ? p.status === 'answered' : filter === 'answered' ? p.status === 'answered' :
p.status !== 'archived'; p.status !== 'archived';
const tagMatch = activeTag ? p.tags.includes(activeTag) : true; const tagMatch = activeTag ? p.tags.includes(activeTag) : true;
return statusMatch && tagMatch; const searchMatch = matches(p, search);
}); return statusMatch && tagMatch && searchMatch;
}), [prayers, filter, activeTag, search]);
const counts = { const counts = {
active: prayers.filter(p => p.status === 'active').length, active: prayers.filter(p => p.status === 'active').length,
@@ -53,7 +70,8 @@ export default function App() {
if (!newRequest.trim()) return; if (!newRequest.trim()) return;
const tags = newTags.split(',').map(t => t.trim()).filter(Boolean); const tags = newTags.split(',').map(t => t.trim()).filter(Boolean);
try { try {
await addPrayer(newRequest.trim(), tags); await addPrayer(newPerson.trim(), newRequest.trim(), tags);
setNewPerson('');
setNewRequest(''); setNewRequest('');
setNewTags(''); setNewTags('');
setWriteError(null); setWriteError(null);
@@ -77,9 +95,7 @@ export default function App() {
function formatDate(iso: string) { function formatDate(iso: string) {
return new Date(iso).toLocaleDateString(undefined, { return new Date(iso).toLocaleDateString(undefined, {
month: 'short', month: 'short', day: 'numeric', year: 'numeric',
day: 'numeric',
year: 'numeric',
}); });
} }
@@ -87,6 +103,14 @@ export default function App() {
setActiveTag(prev => prev === tag ? null : tag); setActiveTag(prev => prev === tag ? null : tag);
} }
const emptyMessage = search
? `No results for "${search}".`
: activeTag
? `No ${filter === 'all' ? '' : filter + ' '}prayers tagged "${activeTag}".`
: filter === 'active'
? 'No active prayers. Add one above.'
: 'Nothing here yet.';
return ( return (
<div className="app"> <div className="app">
<header className="header"> <header className="header">
@@ -95,6 +119,12 @@ export default function App() {
</header> </header>
<form className="add-form" onSubmit={handleAdd}> <form className="add-form" onSubmit={handleAdd}>
<input
className="person-input"
placeholder="Who are you praying for? (optional)"
value={newPerson}
onChange={e => setNewPerson(e.target.value)}
/>
<textarea <textarea
className="request-input" className="request-input"
placeholder="What would you like to pray about?" placeholder="What would you like to pray about?"
@@ -115,6 +145,7 @@ export default function App() {
</div> </div>
</form> </form>
<div className="toolbar">
<div className="filter-bar"> <div className="filter-bar">
<button <button
className={`filter-btn ${filter === 'active' ? 'active' : ''}`} className={`filter-btn ${filter === 'active' ? 'active' : ''}`}
@@ -136,9 +167,23 @@ export default function App() {
</button> </button>
</div> </div>
<div className="search-wrap">
<span className="search-icon">⌕</span>
<input
className="search-input"
placeholder="Search prayers…"
value={search}
onChange={e => setSearch(e.target.value)}
/>
{search && (
<button className="search-clear" onClick={() => setSearch('')}>✕</button>
)}
</div>
</div>
{allTags.length > 0 && ( {allTags.length > 0 && (
<div className="tag-filter-bar"> <div className="tag-filter-bar">
<span className="tag-filter-label">Filter by tag:</span> <span className="tag-filter-label">Tags:</span>
{allTags.map(tag => ( {allTags.map(tag => (
<button <button
key={tag} key={tag}
@@ -149,30 +194,20 @@ export default function App() {
</button> </button>
))} ))}
{activeTag && ( {activeTag && (
<button className="tag-clear-btn" onClick={() => setActiveTag(null)}> <button className="tag-clear-btn" onClick={() => setActiveTag(null)}>✕ Clear</button>
✕ Clear
</button>
)} )}
</div> </div>
)} )}
{(writeError || apiError) && ( {(writeError || apiError) && (
<div className="error-banner"> <div className="error-banner">⚠ {writeError || apiError}</div>
⚠ {writeError || apiError}
</div>
)} )}
{loading && <p className="loading">Loading prayers…</p>} {loading && <p className="loading">Loading prayers…</p>}
<ul className="prayer-list"> <ul className="prayer-list">
{filtered.length === 0 && !loading && ( {filtered.length === 0 && !loading && (
<li className="empty"> <li className="empty">{emptyMessage}</li>
{activeTag
? `No ${filter === 'all' ? '' : filter + ' '}prayers tagged "${activeTag}".`
: filter === 'active'
? 'No active prayers. Add one above.'
: 'Nothing here yet.'}
</li>
)} )}
{filtered.map(prayer => ( {filtered.map(prayer => (
@@ -182,10 +217,9 @@ export default function App() {
expanded={expandedId === prayer.id} expanded={expandedId === prayer.id}
editingAnswer={editingAnswer?.id === prayer.id ? editingAnswer.text : null} editingAnswer={editingAnswer?.id === prayer.id ? editingAnswer.text : null}
activeTag={activeTag} activeTag={activeTag}
searchQuery={search}
onTagClick={handleTagClick} onTagClick={handleTagClick}
onToggle={() => onToggle={() => setExpandedId(expandedId === prayer.id ? null : prayer.id)}
setExpandedId(expandedId === prayer.id ? null : prayer.id)
}
onStartAnswer={() => { onStartAnswer={() => {
setExpandedId(prayer.id); setExpandedId(prayer.id);
setEditingAnswer({ id: prayer.id, text: prayer.answer }); setEditingAnswer({ id: prayer.id, text: prayer.answer });
@@ -205,11 +239,25 @@ export default function App() {
); );
} }
function highlight(text: string, query: string) {
if (!query.trim()) return <>{text}</>;
const regex = new RegExp(`(${query.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')})`, 'gi');
const parts = text.split(regex);
return (
<>
{parts.map((part, i) =>
regex.test(part) ? <mark key={i} className="highlight">{part}</mark> : part
)}
</>
);
}
interface CardProps { interface CardProps {
prayer: Prayer; prayer: Prayer;
expanded: boolean; expanded: boolean;
editingAnswer: string | null; editingAnswer: string | null;
activeTag: string | null; activeTag: string | null;
searchQuery: string;
onTagClick: (tag: string) => void; onTagClick: (tag: string) => void;
onToggle: () => void; onToggle: () => void;
onStartAnswer: () => void; onStartAnswer: () => void;
@@ -228,6 +276,7 @@ function PrayerCard({
expanded, expanded,
editingAnswer, editingAnswer,
activeTag, activeTag,
searchQuery,
onTagClick, onTagClick,
onToggle, onToggle,
onStartAnswer, onStartAnswer,
@@ -244,7 +293,12 @@ function PrayerCard({
<div className="card-top" onClick={onToggle}> <div className="card-top" onClick={onToggle}>
<div className="card-main"> <div className="card-main">
<span className={`status-dot ${prayer.status}`} /> <span className={`status-dot ${prayer.status}`} />
<p className="request-text">{prayer.request}</p> <div className="card-text">
{prayer.person && (
<p className="person-name">{highlight(prayer.person, searchQuery)}</p>
)}
<p className="request-text">{highlight(prayer.request, searchQuery)}</p>
</div>
</div> </div>
<div className="card-meta"> <div className="card-meta">
<span className="date">{formatDate(prayer.createdAt)}</span> <span className="date">{formatDate(prayer.createdAt)}</span>
@@ -266,11 +320,9 @@ function PrayerCard({
{prayer.status === 'answered' && prayer.answer && editingAnswer === null && ( {prayer.status === 'answered' && prayer.answer && editingAnswer === null && (
<div className="answer-section"> <div className="answer-section">
<label className="answer-label">Answer</label> <label className="answer-label">Answer</label>
<p className="answer-text">{prayer.answer}</p> <p className="answer-text">{highlight(prayer.answer, searchQuery)}</p>
{prayer.answeredAt && ( {prayer.answeredAt && (
<span className="answered-date"> <span className="answered-date">Answered {formatDate(prayer.answeredAt)}</span>
Answered {formatDate(prayer.answeredAt)}
</span>
)} )}
<button className="btn btn-sm" onClick={onStartAnswer}>Edit answer</button> <button className="btn btn-sm" onClick={onStartAnswer}>Edit answer</button>
</div> </div>
+1
View File
@@ -1,5 +1,6 @@
export interface Prayer { export interface Prayer {
id: string; id: string;
person: string;
request: string; request: string;
answer: string; answer: string;
status: 'active' | 'answered' | 'archived'; status: 'active' | 'answered' | 'archived';
+2 -1
View File
@@ -24,8 +24,9 @@ export function usePrayers() {
.finally(() => setLoading(false)); .finally(() => setLoading(false));
}, []); }, []);
const addPrayer = useCallback(async (request: string, tags: string[]) => { const addPrayer = useCallback(async (person: string, request: string, tags: string[]) => {
const prayer = { const prayer = {
person,
request, request,
answer: '', answer: '',
status: 'active', status: 'active',