From 6c33fc460661b70b92cfe257910eb6262e210871 Mon Sep 17 00:00:00 2001 From: nmemmert Date: Fri, 16 Jan 2026 08:47:10 -0500 Subject: [PATCH] feat: add 'Mark Prayed' button for prayer items with streak tracking --- public/sw.js | 2 +- src/app/page.tsx | 27 ++++++++---- src/components/DailyEntry.tsx | 26 ------------ src/components/HomePage.tsx | 31 ++++++-------- src/components/ThingsToPrayFor.tsx | 67 +++++++++++++++--------------- 5 files changed, 66 insertions(+), 87 deletions(-) diff --git a/public/sw.js b/public/sw.js index 02afcda..8cac795 100644 --- a/public/sw.js +++ b/public/sw.js @@ -1 +1 @@ -if(!self.define){let e,s={};const a=(a,n)=>(a=new URL(a+".js",n).href,s[a]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=a,e.onload=s,document.head.appendChild(e)}else e=a,importScripts(a),s()}).then(()=>{let e=s[a];if(!e)throw new Error(`Module ${a} didn’t register its module`);return e}));self.define=(n,c)=>{const i=e||("document"in self?document.currentScript.src:"")||location.href;if(s[i])return;let t={};const r=e=>a(e,i),o={module:{uri:i},exports:t,require:r};s[i]=Promise.all(n.map(e=>o[e]||r(e))).then(e=>(c(...e),t))}}define(["./workbox-4754cb34"],function(e){"use strict";importScripts(),self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"/_next/static/MjqTcdbH4CGo7rDQKMqgw/_buildManifest.js",revision:"44608b7d53e1eefcd54452c125d6300e"},{url:"/_next/static/MjqTcdbH4CGo7rDQKMqgw/_ssgManifest.js",revision:"b6652df95db52feb4daf4eca35380933"},{url:"/_next/static/chunks/172-71074a5b97c03327.js",revision:"71074a5b97c03327"},{url:"/_next/static/chunks/462-718696c85490a0df.js",revision:"718696c85490a0df"},{url:"/_next/static/chunks/497-dc7d5e6b69ac9e5c.js",revision:"dc7d5e6b69ac9e5c"},{url:"/_next/static/chunks/4bd1b696-b7529f9b306ab05d.js",revision:"b7529f9b306ab05d"},{url:"/_next/static/chunks/512-8d2b9de6fda25175.js",revision:"8d2b9de6fda25175"},{url:"/_next/static/chunks/7508b87c-97d7ae290120d64a.js",revision:"97d7ae290120d64a"},{url:"/_next/static/chunks/995.a093d11da39e25d3.js",revision:"a093d11da39e25d3"},{url:"/_next/static/chunks/app/_global-error/page-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/app/_not-found/page-f75e7ecfbcc8dd77.js",revision:"f75e7ecfbcc8dd77"},{url:"/_next/static/chunks/app/admin/page-121d83c28093566e.js",revision:"121d83c28093566e"},{url:"/_next/static/chunks/app/api/debug-smtp/route-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/app/api/send-email/route-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/app/api/send-scheduled-emails/route-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/app/layout-7f3802a6a2a60f7d.js",revision:"7f3802a6a2a60f7d"},{url:"/_next/static/chunks/app/page-f1d3569e14c0e94e.js",revision:"f1d3569e14c0e94e"},{url:"/_next/static/chunks/app/profile/page-7124e76cdfa45e42.js",revision:"7124e76cdfa45e42"},{url:"/_next/static/chunks/app/testimonies/page-7fc7ddaa6cbd104f.js",revision:"7fc7ddaa6cbd104f"},{url:"/_next/static/chunks/dd8162e8-bea2cd35813297c3.js",revision:"bea2cd35813297c3"},{url:"/_next/static/chunks/framework-292291387d6b2e39.js",revision:"292291387d6b2e39"},{url:"/_next/static/chunks/main-5e55aa9a8969fd08.js",revision:"5e55aa9a8969fd08"},{url:"/_next/static/chunks/main-app-1640b70ccc992192.js",revision:"1640b70ccc992192"},{url:"/_next/static/chunks/next/dist/client/components/builtin/app-error-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/next/dist/client/components/builtin/forbidden-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/next/dist/client/components/builtin/global-error-647436fbb68222b8.js",revision:"647436fbb68222b8"},{url:"/_next/static/chunks/next/dist/client/components/builtin/not-found-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/next/dist/client/components/builtin/unauthorized-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/polyfills-42372ed130431b0a.js",revision:"846118c33b2c0e922d7b3a7676f81f6f"},{url:"/_next/static/chunks/webpack-6b6a51bcb4cc4744.js",revision:"6b6a51bcb4cc4744"},{url:"/_next/static/css/a09d3c2fda316d1e.css",revision:"a09d3c2fda316d1e"},{url:"/_next/static/media/4cf2300e9c8272f7-s.p.woff2",revision:"18bae71b1e1b2bb25321090a3b563103"},{url:"/_next/static/media/747892c23ea88013-s.woff2",revision:"a0761690ccf4441ace5cec893b82d4ab"},{url:"/_next/static/media/8d697b304b401681-s.woff2",revision:"cc728f6c0adb04da0dfcb0fc436a8ae5"},{url:"/_next/static/media/93f479601ee12b01-s.p.woff2",revision:"da83d5f06d825c5ae65b7cca706cb312"},{url:"/_next/static/media/9610d9e46709d722-s.woff2",revision:"7b7c0ef93df188a852344fc272fc096b"},{url:"/_next/static/media/ba015fad6dcf6784-s.woff2",revision:"8ea4f719af3312a055caf09f34c89a77"},{url:"/file.svg",revision:"d09f95206c3fa0bb9bd9fefabfd0ea71"},{url:"/firebase-messaging-sw.js",revision:"396ffcf00a63da03dfc03d78d4815494"},{url:"/globe.svg",revision:"2aaafa6a49b6563925fe440891e32717"},{url:"/icon-192x192.png",revision:"bbbd7efc0e31088ae0a3aeede7608534"},{url:"/icon-512x512.png",revision:"400538d76556a3a8ee4fd3dfda7bc092"},{url:"/locales/en/common.json",revision:"41332abbb11f0b33b3eb308a5448f8d6"},{url:"/manifest.json",revision:"928e96ccc236cff27f97d358c0517c73"},{url:"/next.svg",revision:"8e061864f388b47f33a1c3780831193e"},{url:"/vercel.svg",revision:"c0af2f507b369b085b35ef4bbe3bcf1e"},{url:"/window.svg",revision:"a2760511c65806022ad20adf74370ff3"}],{ignoreURLParametersMatching:[]}),e.cleanupOutdatedCaches(),e.registerRoute("/",new e.NetworkFirst({cacheName:"start-url",plugins:[{cacheWillUpdate:async({request:e,response:s,event:a,state:n})=>s&&"opaqueredirect"===s.type?new Response(s.body,{status:200,statusText:"OK",headers:s.headers}):s}]}),"GET"),e.registerRoute(/^https:\/\/fonts\.(?:gstatic)\.com\/.*/i,new e.CacheFirst({cacheName:"google-fonts-webfonts",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:31536e3})]}),"GET"),e.registerRoute(/^https:\/\/fonts\.(?:googleapis)\.com\/.*/i,new e.StaleWhileRevalidate({cacheName:"google-fonts-stylesheets",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:604800})]}),"GET"),e.registerRoute(/\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,new e.StaleWhileRevalidate({cacheName:"static-font-assets",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:604800})]}),"GET"),e.registerRoute(/\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,new e.StaleWhileRevalidate({cacheName:"static-image-assets",plugins:[new e.ExpirationPlugin({maxEntries:64,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\/_next\/image\?url=.+$/i,new e.StaleWhileRevalidate({cacheName:"next-image",plugins:[new e.ExpirationPlugin({maxEntries:64,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:mp3|wav|ogg)$/i,new e.CacheFirst({cacheName:"static-audio-assets",plugins:[new e.RangeRequestsPlugin,new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:mp4)$/i,new e.CacheFirst({cacheName:"static-video-assets",plugins:[new e.RangeRequestsPlugin,new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:js)$/i,new e.StaleWhileRevalidate({cacheName:"static-js-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:css|less)$/i,new e.StaleWhileRevalidate({cacheName:"static-style-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\/_next\/data\/.+\/.+\.json$/i,new e.StaleWhileRevalidate({cacheName:"next-data",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:json|xml|csv)$/i,new e.NetworkFirst({cacheName:"static-data-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>{if(!(self.origin===e.origin))return!1;const s=e.pathname;return!s.startsWith("/api/auth/")&&!!s.startsWith("/api/")},new e.NetworkFirst({cacheName:"apis",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:16,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>{if(!(self.origin===e.origin))return!1;return!e.pathname.startsWith("/api/")},new e.NetworkFirst({cacheName:"others",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>!(self.origin===e.origin),new e.NetworkFirst({cacheName:"cross-origin",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:3600})]}),"GET")}); +if(!self.define){let e,s={};const a=(a,n)=>(a=new URL(a+".js",n).href,s[a]||new Promise(s=>{if("document"in self){const e=document.createElement("script");e.src=a,e.onload=s,document.head.appendChild(e)}else e=a,importScripts(a),s()}).then(()=>{let e=s[a];if(!e)throw new Error(`Module ${a} didn’t register its module`);return e}));self.define=(n,i)=>{const c=e||("document"in self?document.currentScript.src:"")||location.href;if(s[c])return;let t={};const r=e=>a(e,c),o={module:{uri:c},exports:t,require:r};s[c]=Promise.all(n.map(e=>o[e]||r(e))).then(e=>(i(...e),t))}}define(["./workbox-4754cb34"],function(e){"use strict";importScripts(),self.skipWaiting(),e.clientsClaim(),e.precacheAndRoute([{url:"/_next/static/chunks/172-71074a5b97c03327.js",revision:"71074a5b97c03327"},{url:"/_next/static/chunks/462-718696c85490a0df.js",revision:"718696c85490a0df"},{url:"/_next/static/chunks/497-dc7d5e6b69ac9e5c.js",revision:"dc7d5e6b69ac9e5c"},{url:"/_next/static/chunks/4bd1b696-b7529f9b306ab05d.js",revision:"b7529f9b306ab05d"},{url:"/_next/static/chunks/512-8d2b9de6fda25175.js",revision:"8d2b9de6fda25175"},{url:"/_next/static/chunks/7508b87c-97d7ae290120d64a.js",revision:"97d7ae290120d64a"},{url:"/_next/static/chunks/995.a093d11da39e25d3.js",revision:"a093d11da39e25d3"},{url:"/_next/static/chunks/app/_global-error/page-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/app/_not-found/page-f75e7ecfbcc8dd77.js",revision:"f75e7ecfbcc8dd77"},{url:"/_next/static/chunks/app/admin/page-121d83c28093566e.js",revision:"121d83c28093566e"},{url:"/_next/static/chunks/app/api/debug-smtp/route-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/app/api/send-email/route-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/app/api/send-scheduled-emails/route-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/app/layout-7f3802a6a2a60f7d.js",revision:"7f3802a6a2a60f7d"},{url:"/_next/static/chunks/app/page-da425629f73a1f3a.js",revision:"da425629f73a1f3a"},{url:"/_next/static/chunks/app/profile/page-7124e76cdfa45e42.js",revision:"7124e76cdfa45e42"},{url:"/_next/static/chunks/app/testimonies/page-7fc7ddaa6cbd104f.js",revision:"7fc7ddaa6cbd104f"},{url:"/_next/static/chunks/dd8162e8-bea2cd35813297c3.js",revision:"bea2cd35813297c3"},{url:"/_next/static/chunks/framework-292291387d6b2e39.js",revision:"292291387d6b2e39"},{url:"/_next/static/chunks/main-5e55aa9a8969fd08.js",revision:"5e55aa9a8969fd08"},{url:"/_next/static/chunks/main-app-1640b70ccc992192.js",revision:"1640b70ccc992192"},{url:"/_next/static/chunks/next/dist/client/components/builtin/app-error-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/next/dist/client/components/builtin/forbidden-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/next/dist/client/components/builtin/global-error-647436fbb68222b8.js",revision:"647436fbb68222b8"},{url:"/_next/static/chunks/next/dist/client/components/builtin/not-found-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/next/dist/client/components/builtin/unauthorized-2af6c391bfa86449.js",revision:"2af6c391bfa86449"},{url:"/_next/static/chunks/polyfills-42372ed130431b0a.js",revision:"846118c33b2c0e922d7b3a7676f81f6f"},{url:"/_next/static/chunks/webpack-6b6a51bcb4cc4744.js",revision:"6b6a51bcb4cc4744"},{url:"/_next/static/css/ec0e59c59f332d11.css",revision:"ec0e59c59f332d11"},{url:"/_next/static/media/4cf2300e9c8272f7-s.p.woff2",revision:"18bae71b1e1b2bb25321090a3b563103"},{url:"/_next/static/media/747892c23ea88013-s.woff2",revision:"a0761690ccf4441ace5cec893b82d4ab"},{url:"/_next/static/media/8d697b304b401681-s.woff2",revision:"cc728f6c0adb04da0dfcb0fc436a8ae5"},{url:"/_next/static/media/93f479601ee12b01-s.p.woff2",revision:"da83d5f06d825c5ae65b7cca706cb312"},{url:"/_next/static/media/9610d9e46709d722-s.woff2",revision:"7b7c0ef93df188a852344fc272fc096b"},{url:"/_next/static/media/ba015fad6dcf6784-s.woff2",revision:"8ea4f719af3312a055caf09f34c89a77"},{url:"/_next/static/zGoUFgd26mjX9VCibjeQJ/_buildManifest.js",revision:"44608b7d53e1eefcd54452c125d6300e"},{url:"/_next/static/zGoUFgd26mjX9VCibjeQJ/_ssgManifest.js",revision:"b6652df95db52feb4daf4eca35380933"},{url:"/file.svg",revision:"d09f95206c3fa0bb9bd9fefabfd0ea71"},{url:"/firebase-messaging-sw.js",revision:"396ffcf00a63da03dfc03d78d4815494"},{url:"/globe.svg",revision:"2aaafa6a49b6563925fe440891e32717"},{url:"/icon-192x192.png",revision:"bbbd7efc0e31088ae0a3aeede7608534"},{url:"/icon-512x512.png",revision:"400538d76556a3a8ee4fd3dfda7bc092"},{url:"/locales/en/common.json",revision:"41332abbb11f0b33b3eb308a5448f8d6"},{url:"/manifest.json",revision:"928e96ccc236cff27f97d358c0517c73"},{url:"/next.svg",revision:"8e061864f388b47f33a1c3780831193e"},{url:"/vercel.svg",revision:"c0af2f507b369b085b35ef4bbe3bcf1e"},{url:"/window.svg",revision:"a2760511c65806022ad20adf74370ff3"}],{ignoreURLParametersMatching:[]}),e.cleanupOutdatedCaches(),e.registerRoute("/",new e.NetworkFirst({cacheName:"start-url",plugins:[{cacheWillUpdate:async({request:e,response:s,event:a,state:n})=>s&&"opaqueredirect"===s.type?new Response(s.body,{status:200,statusText:"OK",headers:s.headers}):s}]}),"GET"),e.registerRoute(/^https:\/\/fonts\.(?:gstatic)\.com\/.*/i,new e.CacheFirst({cacheName:"google-fonts-webfonts",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:31536e3})]}),"GET"),e.registerRoute(/^https:\/\/fonts\.(?:googleapis)\.com\/.*/i,new e.StaleWhileRevalidate({cacheName:"google-fonts-stylesheets",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:604800})]}),"GET"),e.registerRoute(/\.(?:eot|otf|ttc|ttf|woff|woff2|font.css)$/i,new e.StaleWhileRevalidate({cacheName:"static-font-assets",plugins:[new e.ExpirationPlugin({maxEntries:4,maxAgeSeconds:604800})]}),"GET"),e.registerRoute(/\.(?:jpg|jpeg|gif|png|svg|ico|webp)$/i,new e.StaleWhileRevalidate({cacheName:"static-image-assets",plugins:[new e.ExpirationPlugin({maxEntries:64,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\/_next\/image\?url=.+$/i,new e.StaleWhileRevalidate({cacheName:"next-image",plugins:[new e.ExpirationPlugin({maxEntries:64,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:mp3|wav|ogg)$/i,new e.CacheFirst({cacheName:"static-audio-assets",plugins:[new e.RangeRequestsPlugin,new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:mp4)$/i,new e.CacheFirst({cacheName:"static-video-assets",plugins:[new e.RangeRequestsPlugin,new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:js)$/i,new e.StaleWhileRevalidate({cacheName:"static-js-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:css|less)$/i,new e.StaleWhileRevalidate({cacheName:"static-style-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\/_next\/data\/.+\/.+\.json$/i,new e.StaleWhileRevalidate({cacheName:"next-data",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(/\.(?:json|xml|csv)$/i,new e.NetworkFirst({cacheName:"static-data-assets",plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>{if(!(self.origin===e.origin))return!1;const s=e.pathname;return!s.startsWith("/api/auth/")&&!!s.startsWith("/api/")},new e.NetworkFirst({cacheName:"apis",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:16,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>{if(!(self.origin===e.origin))return!1;return!e.pathname.startsWith("/api/")},new e.NetworkFirst({cacheName:"others",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:86400})]}),"GET"),e.registerRoute(({url:e})=>!(self.origin===e.origin),new e.NetworkFirst({cacheName:"cross-origin",networkTimeoutSeconds:10,plugins:[new e.ExpirationPlugin({maxEntries:32,maxAgeSeconds:3600})]}),"GET")}); diff --git a/src/app/page.tsx b/src/app/page.tsx index 30297e0..d35a5ba 100644 --- a/src/app/page.tsx +++ b/src/app/page.tsx @@ -39,7 +39,6 @@ export default function Home() { const [prayFor, setPrayFor] = useState(''); const [answered, setAnswered] = useState(false); const [answerDetails, setAnswerDetails] = useState(''); - const [prayFrequency, setPrayFrequency] = useState(1); // 1-7 times per week const { user, loading: authLoading } = useAuth(); @@ -109,8 +108,6 @@ export default function Home() { prayFor: prayFor || undefined, answered, answerDetails: answerDetails || undefined, - prayFrequency, - lastPrayedFor: answered ? undefined : new Date().toISOString().split('T')[0], }; if (editingPrayer) { @@ -147,7 +144,6 @@ export default function Home() { setPrayFor(prayer.prayFor || ''); setAnswered(prayer.answered || false); setAnswerDetails(prayer.answerDetails || ''); - setPrayFrequency(prayer.prayFrequency || 1); setActiveTab('compose'); }; @@ -161,6 +157,25 @@ export default function Home() { } }; + const handleMarkPrayed = async (prayerId: string) => { + if (!user) return; + + try { + const today = new Date().toISOString().split('T')[0]; + await updateDoc(doc(db, 'prayers', prayerId), { + lastPrayedFor: today, + }); + + setPrayers(prev => + prev.map(p => (p.id === prayerId ? { ...p, lastPrayedFor: today } : p)) + ); + toast.success('Prayed! 🙏'); + } catch (error) { + console.error('Error marking prayed:', error); + toast.error('Failed to update'); + } + }; + if (authLoading) { return (
@@ -227,8 +242,6 @@ export default function Home() { onAnsweredChange={setAnswered} answerDetails={answerDetails} onAnswerDetailsChange={setAnswerDetails} - prayFrequency={prayFrequency} - onPrayFrequencyChange={setPrayFrequency} onSubmit={handleSubmit} isEditing={!!editingPrayer} /> @@ -243,7 +256,7 @@ export default function Home() { )} {activeTab === 'praying' && ( - !p.answered)} onEdit={handleSelectPrayer} /> + !p.answered)} onEdit={handleSelectPrayer} onMarkPrayed={handleMarkPrayed} /> )} {activeTab === 'reflections' && ( diff --git a/src/components/DailyEntry.tsx b/src/components/DailyEntry.tsx index 7daeca7..68e58aa 100644 --- a/src/components/DailyEntry.tsx +++ b/src/components/DailyEntry.tsx @@ -14,8 +14,6 @@ interface DailyEntryProps { onAnsweredChange?: (answered: boolean) => void; answerDetails?: string; onAnswerDetailsChange?: (details: string) => void; - prayFrequency?: number; - onPrayFrequencyChange?: (frequency: number) => void; onSubmit: (e: React.FormEvent) => void; loading?: boolean; isEditing?: boolean; @@ -32,8 +30,6 @@ export default function DailyEntry({ onAnsweredChange, answerDetails = '', onAnswerDetailsChange, - prayFrequency = 1, - onPrayFrequencyChange, onSubmit, loading = false, isEditing = false, @@ -120,28 +116,6 @@ export default function DailyEntry({
- {/* Prayer Frequency Slider */} -
-
- -
- onPrayFrequencyChange?.(parseInt(e.target.value))} - className="flex-1 h-2 bg-slate-700 rounded-lg appearance-none cursor-pointer accent-blue-500" - /> - {prayFrequency}x -
-
- 1× week - Daily -
-
-
- {/* Answer Details */} {answered && (
diff --git a/src/components/HomePage.tsx b/src/components/HomePage.tsx index c806c3b..1f4358f 100644 --- a/src/components/HomePage.tsx +++ b/src/components/HomePage.tsx @@ -34,16 +34,25 @@ export default function HomePage({ prayers, todayCount, onStartPraying, onSelect const calculateStreak = () => { if (prayers.length === 0) return 0; - const prayerDates = Array.from(new Set(prayers.map(p => p.date))).sort().reverse(); + // Get all dates where user either created a prayer OR marked something as prayed for + const activityDates = new Set(); + prayers.forEach(p => { + activityDates.add(p.date); // Date prayer was created + if (p.lastPrayedFor) { + activityDates.add(p.lastPrayedFor); // Date marked as prayed for + } + }); + + const sortedDates = Array.from(activityDates).sort().reverse(); let streak = 0; let checkDate = new Date(today); for (let i = 0; i < 365; i++) { const dateStr = checkDate.toISOString().split('T')[0]; - if (prayerDates.includes(dateStr)) { + if (sortedDates.includes(dateStr)) { streak++; } else if (i === 0) { - // If today has no prayer, streak is broken (unless we haven't prayed today yet, which is ok) + // If today has no activity, streak is broken break; } else { break; @@ -54,23 +63,7 @@ export default function HomePage({ prayers, todayCount, onStartPraying, onSelect return streak; }; - // Calculate frequency compliance - how many active items being prayed for - const frequencyCompliance = () => { - const activePrayers = prayers.filter(p => !p.answered && p.prayFrequency); - if (activePrayers.length === 0) return 0; - - // Check today's date - const todayPrayers = prayers.filter(p => p.date === today); - return { - total: activePrayers.length, - prayedToday: activePrayers.filter(ap => - todayPrayers.some(tp => tp.prayFor === ap.prayFor || tp.id === ap.id) - ).length, - }; - }; - const streak = calculateStreak(); - const frequencyStats = frequencyCompliance(); // Calculate more stats const avgPrayerLength = totalPrayers > 0 diff --git a/src/components/ThingsToPrayFor.tsx b/src/components/ThingsToPrayFor.tsx index 7576eac..b255635 100644 --- a/src/components/ThingsToPrayFor.tsx +++ b/src/components/ThingsToPrayFor.tsx @@ -17,9 +17,10 @@ interface Prayer { interface ThingsToPrayForProps { prayers: Prayer[]; onEdit: (prayer: Prayer) => void; + onMarkPrayed: (prayerId: string) => void; } -export default function ThingsToPrayFor({ prayers, onEdit }: ThingsToPrayForProps) { +export default function ThingsToPrayFor({ prayers, onEdit, onMarkPrayed }: ThingsToPrayForProps) { // Filter for unanswered prayers const thingsToPrayFor = prayers.filter(p => !p.answered).sort((a, b) => new Date(b.date).getTime() - new Date(a.date).getTime() @@ -78,52 +79,50 @@ export default function ThingsToPrayFor({ prayers, onEdit }: ThingsToPrayForProp const daysAgo = Math.floor( (new Date().getTime() - new Date(prayer.date).getTime()) / (1000 * 60 * 60 * 24) ); + const today = new Date().toISOString().split('T')[0]; + const prayedToday = prayer.lastPrayedFor === today; return ( - +
- {prayer.prayFrequency && ( -
-
Pray:
-
- {Array.from({ length: prayer.prayFrequency }).map((_, i) => ( -
- ))} - {Array.from({ length: 7 - prayer.prayFrequency }).map((_, i) => ( -
- ))} -
- × per week -
- )}
- + ); })}