filter for upcoming in grid and calendar

Author: Tony Qiu

.github/workflows/instagram_feed.yml

@@ -95,6 +95,12 @@ jobs:
         working-directory: backend/scraping
         run: python get_static_events.py
 
+      - name: Generate recommended filters
+        if: github.event_name == 'schedule' || github.event.inputs.run_scraper == 'true'
+        working-directory: backend/scripts
+        run: python generate_recommended_filters.py
+        continue-on-error: true
+      
       - name: Send newsletter to subscribers
         if: github.event_name == 'schedule' || github.event.inputs.run_scraper == 'true'
         working-directory: backend/scripts
@@ -106,6 +112,6 @@ jobs:
         run: |
           git config --global user.name 'github-actions[bot]'
           git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-          git add frontend/src/data/staticEvents.ts
-          git commit -m "chore: update static events from DB" || echo "No changes to commit"
+          git add frontend/src/data/staticEvents.ts frontend/src/data/staticData.ts
+          git commit -m "chore: update static events and recommended filters from DB" || echo "No changes to commit"
           git push

backend/scraping/instagram_feed.py

@@ -404,24 +404,5 @@ def session():
         logger.info("Session created successfully!")
         process_recent_feed(L)
 
-        # Generate recommended filters after processing feed
-        logger.info("Generating recommended filters from upcoming events...")
-        try:
-            script_path = Path(__file__).resolve().parent.parent / "scripts" / "generate_recommended_filters.py"
-            result = subprocess.run(
-                [sys.executable, str(script_path)],
-                capture_output=True,
-                text=True,
-                timeout=120
-            )
-            if result.returncode == 0:
-                logger.info("✅ Recommended filters generated successfully")
-                if result.stdout:
-                    logger.info(f"Output: {result.stdout}")
-            else:
-                logger.error(f"❌ Failed to generate recommended filters: {result.stderr}")
-        except Exception as e:
-            logger.error(f"Error running filter generation script: {e}")
-            logger.error(f"Traceback: {traceback.format_exc()}")
     else:
         logger.critical("Failed to initialize Instagram session, stopping...")

frontend/src/hooks/useEvents.ts

@@ -112,41 +112,36 @@ export function useEvents(view: "grid" | "calendar") {
       rawEvents = Array.from(staticEventsData.values());
     }
 
-    if (view === "grid") {
-      const now = new Date();
-      const todayStr =
-        now.getFullYear() +
-        "-" +
-        String(now.getMonth() + 1).padStart(2, "0") +
-        "-" +
-        String(now.getDate()).padStart(2, "0");
-
-      // Filter for future events and events happening today that haven't finished
-      return rawEvents.filter((event) => {
-        const eventDateStr = event.date;
-
-        // If event is on a future date, include it
-        if (eventDateStr > todayStr) {
-          return true;
-        }
-
-        // If event is today, check if it hasn't finished yet
-        if (eventDateStr === todayStr) {
-          const [hours, minutes] = event.end_time.split(":").map(Number);
-          const eventEndDateTime = new Date();
-          eventEndDateTime.setHours(hours, minutes, 0, 0);
-
-          // Include if event hasn't finished yet (current time < event end time)
-          return now < eventEndDateTime;
-        }
-
-        return false;
-      });
-    }
-
-    // For calendar view, return all events (backend already sorted them)
-    return rawEvents;
-  }, [hasActiveFilters, data?.event_ids, view]);
+    const now = new Date();
+    const todayStr =
+      now.getFullYear() +
+      "-" +
+      String(now.getMonth() + 1).padStart(2, "0") +
+      "-" +
+      String(now.getDate()).padStart(2, "0");
+
+    // Filter for future events and events happening today that haven't finished
+    return rawEvents.filter((event) => {
+      const eventDateStr = event.date;
+
+      // If event is on a future date, include it
+      if (eventDateStr > todayStr) {
+        return true;
+      }
+
+      // If event is today, check if it hasn't finished yet
+      if (eventDateStr === todayStr) {
+        const [hours, minutes] = event.end_time.split(":").map(Number);
+        const eventEndDateTime = new Date();
+        eventEndDateTime.setHours(hours, minutes, 0, 0);
+
+        // Include if event hasn't finished yet (current time < event end time)
+        return now < eventEndDateTime;
+      }
+
+      return false;
+    });
+  }, [hasActiveFilters, data?.event_ids]);
 
   const previousTitleRef = useRef<string>("Events - Wat2Do");
 

frontend/src/pages/AboutPage.tsx

@@ -203,7 +203,7 @@ const AboutPage: React.FC = () => {
         </h2>
         <p className="text-gray-600 dark:text-gray-300 mb-8">
           Check Wat2Do regularly for new events. Subscribe to our newsletter for
-          weekly updates. Don't be afraid to attend events alone! The best
+          daily updates. Don't be afraid to attend events alone! The best
           connections happen when you show up.
         </p>