From deb0269a67a5ee16b46ab5faf7984baaf9a1aab8 Mon Sep 17 00:00:00 2001
From: Joshua Ryder <ryderjj89@outlook.com>
Date: Thu, 2 Oct 2025 00:23:14 -0400
Subject: [PATCH] Restructure home page: separate Today's Sermon, Upcoming
 Sermons, and Previous Sermons sections

---
 pages/index.vue | 81 +++++++++++++++++++++++++------------------------
 1 file changed, 41 insertions(+), 40 deletions(-)

diff --git a/pages/index.vue b/pages/index.vue
index b9311e8..befefd5 100644
--- a/pages/index.vue
+++ b/pages/index.vue
@@ -45,22 +45,31 @@
     </header>
 
     <!-- Main Content -->
-    <main class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-12">
-      <!-- Most Recent Sermon -->
-      <div v-if="mostRecentSermon">
-        <ClientOnly>
-          <h2 class="text-2xl font-semibold text-gray-900 mb-6">{{ sermonHeading }}</h2>
-          <template #fallback>
-            <h2 class="text-2xl font-semibold text-gray-900 mb-6">Most Recent Sermon</h2>
-          </template>
-        </ClientOnly>
+    <main class="max-w-7xl mx-auto px-4 sm:px-6 lg:px-8 py-12 space-y-12">
+      <!-- Today's Sermon -->
+      <div v-if="todaysSermon">
+        <h2 class="text-2xl font-semibold text-gray-900 mb-6">Today's Sermon</h2>
         <div class="max-w-md mx-auto">
-          <SermonCard :sermon="mostRecentSermon" />
+          <SermonCard :sermon="todaysSermon" />
         </div>
       </div>
 
+      <!-- Upcoming Sermons -->
+      <div v-if="upcomingSermons.length > 0">
+        <h2 class="text-2xl font-semibold text-gray-900 mb-6">Upcoming Sermons</h2>
+        <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-6">
+          <SermonCard v-for="sermon in upcomingSermons" :key="sermon.id" :sermon="sermon" />
+        </div>
+      </div>
+
+      <!-- Empty State (if no current or upcoming sermons) -->
+      <div v-if="!hasCurrentSermons" class="text-center py-12">
+        <p class="text-gray-500 text-lg">No upcoming sermons available yet.</p>
+      </div>
+
       <!-- Previous Sermons Dropdown -->
-      <div v-if="previousSermons.length > 0" class="mt-12 max-w-2xl mx-auto">
+      <div v-if="previousSermons.length > 0" class="max-w-2xl mx-auto">
+        <h2 class="text-2xl font-semibold text-gray-900 mb-4 text-center">Previous Sermons</h2>
         <p class="text-center text-gray-700 mb-4">Use the dropdown below to view a previous sermon</p>
         <div class="flex gap-3">
           <select
@@ -81,11 +90,6 @@
           </button>
         </div>
       </div>
-
-      <!-- Empty State -->
-      <div v-if="!mostRecentSermon" class="text-center py-12">
-        <p class="text-gray-500 text-lg">No sermons available yet.</p>
-      </div>
     </main>
   </div>
 </template>
@@ -103,26 +107,32 @@ const { data: archivedSermons } = await useFetch('/api/sermons?includeArchived=t
 
 const selectedSermonSlug = ref('')
 
-// Get most recent non-archived sermon (closest to or on today's date, not future dates)
-const mostRecentSermon = computed(() => {
+// Get today's sermon (if one exists for today's date)
+const todaysSermon = computed(() => {
   if (!activeSermons.value || activeSermons.value.length === 0) return null
   
   const today = new Date()
   today.setHours(0, 0, 0, 0)
   
-  // Find the sermon with the most recent date that is not in the future
-  const validSermons = activeSermons.value.filter((s: any) => {
+  return activeSermons.value.find((s: any) => {
     const sermonDate = new Date(s.date + 'T00:00:00')
     sermonDate.setHours(0, 0, 0, 0)
-    return sermonDate.getTime() <= today.getTime()
+    return sermonDate.getTime() === today.getTime()
+  }) || null
+})
+
+// Get upcoming sermons (future dates)
+const upcomingSermons = computed(() => {
+  if (!activeSermons.value) return []
+  
+  const today = new Date()
+  today.setHours(0, 0, 0, 0)
+  
+  return activeSermons.value.filter((s: any) => {
+    const sermonDate = new Date(s.date + 'T00:00:00')
+    sermonDate.setHours(0, 0, 0, 0)
+    return sermonDate.getTime() > today.getTime()
   })
-  
-  // If no valid sermons (all are future dates), return the earliest future sermon
-  if (validSermons.length === 0) {
-    return activeSermons.value[activeSermons.value.length - 1]
-  }
-  
-  return validSermons[0]
 })
 
 // Get archived sermons only for the previous sermons dropdown
@@ -131,18 +141,9 @@ const previousSermons = computed(() => {
   return archivedSermons.value.filter((s: any) => s.archived === 1)
 })
 
-// Check if most recent sermon is today
-const sermonHeading = computed(() => {
-  if (!mostRecentSermon.value) return 'Recent Sermon'
-  
-  const sermonDate = new Date(mostRecentSermon.value.date + 'T00:00:00')
-  const today = new Date()
-  today.setHours(0, 0, 0, 0)
-  sermonDate.setHours(0, 0, 0, 0)
-  
-  const isToday = sermonDate.getTime() === today.getTime()
-  
-  return isToday ? "Today's Sermon" : 'Most Recent Sermon'
+// Check if there are any current or upcoming sermons
+const hasCurrentSermons = computed(() => {
+  return todaysSermon.value !== null || upcomingSermons.value.length > 0
 })
 
 function formatDate(dateString: string) {