final commit

Author: jeetvasoya21

ACTIVITY_REMINDER_FEATURE.md

@@ -94,18 +94,26 @@ Use the motivational reminders as guidance to:
 
 ## Token Requirements
 
-To use this feature, you need a Personal Access Token with the following permissions:
+**Authentication with a Personal Access Token (PAT) is required** to view and use the ActivityReminder UI. The component is only displayed when you have successfully authenticated with both a GitHub username and a valid PAT.
+
+Your PAT should have the following permissions:
 - `public_repo` (access to public repositories)
 - `repo` (access to private repositories - if tracking private repos)
 
-**Note**: The feature works with or without a token, but with a token you get higher API rate limits.
+Without valid authentication, the Daily Activity Status reminder widget will not be accessible.
 
 ## Technical Details
 
 ### Components
 - **`useGitHubActivity` Hook**: Analyzes activity data and returns activity status
 - **`ActivityReminder` Component**: Displays the reminder UI with all statistics
-- **`activityReminders` Utilities**: Helper functions for generating messages and calculations
+- **Utility Functions** (`activityReminders.ts`): 
+  - `generateReminders()` - Creates motivational alert messages
+  - `generateStreakData()` - Calculates streak and generates streak messages
+  - `getActivitySummary()` - Generates text summary of daily activities
+  - `getActivityColor()` - Returns color coding based on activity level
+  - `calculateProductivityScore()` - Computes dynamic productivity score (0-100%)
+  - `getMotivationLevel()` - Determines motivation tier based on streak
 
 ### API Integration
 The feature leverages the existing GitHub API integration through:

src/components/ActivityReminder.tsx

@@ -27,12 +27,10 @@ import {
 
 interface ActivityReminderProps {
   activity: ActivityStatus;
-  username: string;
 }
 
 const ActivityReminder: React.FC<ActivityReminderProps> = ({
   activity,
-  username,
 }) => {
   const theme = useTheme();
   const reminders = useMemo(() => generateReminders(activity), [activity]);

src/hooks/useGitHubActivity.ts

@@ -47,9 +47,15 @@ export const useGitHubActivity = (
 
     // Separate PR types for today
     const todaysOpenPRs = todaysPRs.filter((pr) => pr.state === 'open');
-    const todaysMergedPRs = todaysPRs.filter(
-      (pr) => pr.pull_request?.merged_at
-    );
+    
+    // Compute merged PRs from all PRs by checking merged_at date (not created_at)
+    // This captures PRs created earlier but merged today
+    const todaysMergedPRs = prs.filter((pr) => {
+      if (!pr.pull_request?.merged_at) return false;
+      const mergedDate = new Date(pr.pull_request.merged_at);
+      mergedDate.setHours(0, 0, 0, 0);
+      return mergedDate.getTime() === today.getTime();
+    });
 
     // Calculate activity flags
     const hasOpenedPRToday = todaysOpenPRs.length > 0;
@@ -82,19 +88,22 @@ export const useGitHubActivity = (
         return itemDate.getTime() === currentDate.getTime();
       });
 
+      // Initialize streak based on activity today
+      // If active today, start at 1 and move to yesterday for iteration
+      // If inactive today, start at 0 and keep currentDate at today
       if (hasActivityToday) {
         contributionStreak = 1;
         currentDate.setDate(currentDate.getDate() - 1);
+      }
 
-        // Count consecutive days backwards
-        for (const item of allActivity) {
-          const itemDate = new Date(item.created_at);
-          itemDate.setHours(0, 0, 0, 0);
+      // Count consecutive days backwards (regardless of activity today)
+      for (const item of allActivity) {
+        const itemDate = new Date(item.created_at);
+        itemDate.setHours(0, 0, 0, 0);
 
-          if (itemDate.getTime() === currentDate.getTime()) {
-            contributionStreak++;
-            currentDate.setDate(currentDate.getDate() - 1);
-          }
+        if (itemDate.getTime() === currentDate.getTime()) {
+          contributionStreak++;
+          currentDate.setDate(currentDate.getDate() - 1);
         }
       }
     }

src/pages/Tracker/Tracker.tsx

@@ -34,6 +34,7 @@ import { useGitHubAuth } from "../../hooks/useGitHubAuth";
 import { useGitHubData } from "../../hooks/useGitHubData";
 import { useGitHubActivity } from "../../hooks/useGitHubActivity";
 import ActivityReminder from "../../components/ActivityReminder";
+import { get30DayWindow } from "../../utils/dateUtils";
 import { KeyIcon } from "lucide-react";
 
 const ROWS_PER_PAGE = 10;
@@ -86,14 +87,24 @@ const Home: React.FC = () => {
   // Fetch data when username, tab, or page changes
   useEffect(() => {
     if (username) {
-      fetchData(username, page + 1, ROWS_PER_PAGE);
+      const { startDate, endDate } = get30DayWindow();
+      const apiFilters = {
+        startDate: startDate,
+        endDate: endDate,
+      };
+      fetchData(username, page + 1, ROWS_PER_PAGE, 'both', apiFilters);
     }
-  }, [tab, page]);
+  }, [tab, page, username]);
 
   const handleSubmit = (e: React.FormEvent<HTMLFormElement>): void => {
     e.preventDefault();
     setPage(0);
-    fetchData(username, 1, ROWS_PER_PAGE);
+    const { startDate, endDate } = get30DayWindow();
+    const apiFilters = {
+      startDate: startDate,
+      endDate: endDate,
+    };
+    fetchData(username, 1, ROWS_PER_PAGE, 'both', apiFilters);
   };
 
   const handlePageChange = (_: unknown, newPage: number) => {
@@ -334,9 +345,9 @@ const Home: React.FC = () => {
         </Alert>
       )}
 
-      {/* Activity Reminder - Show when data is loaded and user is authenticated */}
-      {username && !loading && (issues.length > 0 || prs.length > 0) && (
-        <ActivityReminder activity={activity} username={username} />
+      {/* Activity Reminder - Show when user is authenticated and data is loaded */}
+      {username && !loading && (
+        <ActivityReminder activity={activity} />
       )}
 
       {loading ? (

src/utils/dateUtils.ts

@@ -0,0 +1,21 @@
+/**
+ * Get the date range for the last 30 days
+ * Returns dates in YYYY-MM-DD format suitable for GitHub API queries
+ */
+export const get30DayWindow = (): { startDate: string; endDate: string } => {
+  const today = new Date();
+  const thirtyDaysAgo = new Date(today);
+  thirtyDaysAgo.setDate(thirtyDaysAgo.getDate() - 30);
+
+  const formatDate = (date: Date): string => {
+    const year = date.getFullYear();
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const day = String(date.getDate()).padStart(2, '0');
+    return `${year}-${month}-${day}`;
+  };
+
+  return {
+    startDate: formatDate(thirtyDaysAgo),
+    endDate: formatDate(today),
+  };
+};