From c8da2c157cd9c6040f57a91c1bd7326b4f373e92 Mon Sep 17 00:00:00 2001
From: abhimanyurajeesh <abhimanyurajeesh@gmail.com>
Date: Wed, 2 Apr 2025 22:08:24 +0530
Subject: [PATCH 01/10] Add weekly grouping option to EOD settings and update
 activity display logic

---
 src/app/page.tsx | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/app/page.tsx b/src/app/page.tsx
index efab6da..ea23645 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -106,7 +106,7 @@ export default function Home() {
   });
 
   const includeInEOD = ["Pull Requests Created", "Issues Created", "Issues Assigned", "Commits Made"];
-  const EODSettings = ["Group by day"];
+  const EODSettings = ["Group by day", "Group by week"];
   const CheckboxGroup = Checkbox.Group;
   const [checkedList, setCheckedList] = useState<CheckboxValueType[]>(includeInEOD);
   const [eodSettingsCheckedList, setEodSettingsCheckedList] = useState<CheckboxValueType[]>([]);
@@ -118,6 +118,7 @@ export default function Home() {
   const [settings, setSettings] = useState({
     fetchGithubToken: githubTokenInput,
     splitByDay: false,
+    splitByWeek: false,
   });
 
   const searchParams = useSearchParams();
@@ -201,6 +202,7 @@ export default function Home() {
     setSettings({
       ...settings,
       splitByDay: eodSettingsCheckedList.includes("Group by day"),
+      splitByWeek: eodSettingsCheckedList.includes("Group by week"),
     });
     setShowEODSettings(false);
   };
@@ -527,7 +529,24 @@ export default function Home() {
 
     let groupedActivitiesText = "";
 
-    if (eodSettingsCheckedList.includes("Group by day")) {
+    if (eodSettingsCheckedList.includes("Group by week")) {
+      const weekGroups: { [key: string]: string[] } = {};
+      Object.keys(groupedActivities).forEach((date) => {
+        if (groupedActivities[date].length === 0) return;
+        const weekStart = dayjs(date).startOf("week").format("YYYY-MM-DD");
+        weekGroups[weekStart] ??= [];
+        weekGroups[weekStart].push(...groupedActivities[date]);
+      });
+
+      Object.keys(weekGroups).forEach((weekStart) => {
+        if (weekGroups[weekStart].length === 0) return;
+        const weekEnd = dayjs(weekStart).endOf("week").format("YYYY-MM-DD");
+        groupedActivitiesText += `**Week of ${dayjs(weekStart).format("DD/MM/YYYY")} - ${dayjs(weekEnd).format(
+          "DD/MM/YYYY"
+        )}**\n${weekGroups[weekStart].join("\n")}\n\n`;
+      });
+      eodMessage = eodMessage.replace("{{TODAY_ACTIVITIES}}", "\n" + groupedActivitiesText.trimEnd());
+    } else if (eodSettingsCheckedList.includes("Group by day")) {
       Object.keys(groupedActivities).forEach((date) => {
         if (groupedActivities[date].length === 0) return;
         groupedActivitiesText += `**${dayjs(date).format("DD/MM/YYYY")}**\n${groupedActivities[date].join("\n")}\n\n`;

From 75559cbbe24d16db8adf26fd1b86b3bbefe1f5e9 Mon Sep 17 00:00:00 2001
From: abhimanyurajeesh <abhimanyurajeesh@gmail.com>
Date: Tue, 22 Apr 2025 11:33:25 +0530
Subject: [PATCH 02/10] Add PRs Merged tracking to activity report and update
 EOD settings

---
 src/app/page.tsx | 52 +++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 47 insertions(+), 5 deletions(-)

diff --git a/src/app/page.tsx b/src/app/page.tsx
index ea23645..04cee19 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -102,10 +102,11 @@ export default function Home() {
     issues_assigned: [],
     merged: [],
     commits: [],
+    prs_merged: [],
     error: "",
   });
 
-  const includeInEOD = ["Pull Requests Created", "Issues Created", "Issues Assigned", "Commits Made"];
+  const includeInEOD = ["Pull Requests Created", "Issues Created", "Issues Assigned", "Commits Made", "PRs Merged"];
   const EODSettings = ["Group by day", "Group by week"];
   const CheckboxGroup = Checkbox.Group;
   const [checkedList, setCheckedList] = useState<CheckboxValueType[]>(includeInEOD);
@@ -323,7 +324,7 @@ export default function Home() {
     }
 
     notify("info", "Fetching", "Fetching your GitHub stats");
-    const params = new URLSearchParams(searchParams);
+    const params = new URLSearchParams(searchParams.toString());
     const numDays = dayjs(dateField.value.endDate).diff(dayjs(dateField.value.startDate), "day");
     params.set("username", usernameField.value);
     params.set("org", orgFilter.value);
@@ -351,6 +352,15 @@ export default function Home() {
         pr.type = "pr-created";
       }
 
+      // Fetch merged PRs
+      const mergedPRData = await ghfetch(
+        `https://api.github.com/search/issues?q=author:${usernameField.value}+is:pr+is:merged+merged:${dateField.value.startDate}..${dateField.value.endDate}${orgFilterQuery}&per_page=100`
+      );
+
+      for (const pr of mergedPRData.items) {
+        pr.type = "pr-merged";
+      }
+
       const issuesAssignedData = await ghfetch(
         `https://api.github.com/search/issues?q=assignee:${usernameField.value}+is:issue+created:${dateField.value.startDate}..${dateField.value.endDate}${orgFilterQuery}&per_page=100`
       );
@@ -405,9 +415,22 @@ export default function Home() {
         if (!isLinkedPRPresent) commits.push(commit);
       }
 
-      const mergedTimeline: any = [...issuesData.items, ...prData.items, ...assignedIssues, ...commits].sort(
-        (a: { created_at: string; assigned_at?: string }, b: { created_at: string; assigned_at?: string }) =>
-          dayjs(a.assigned_at || a.created_at).isAfter(dayjs(b.assigned_at || b.created_at)) ? -1 : 1
+      const mergedTimeline: any = [
+        ...issuesData.items,
+        ...prData.items,
+        ...mergedPRData.items,
+        ...assignedIssues,
+        ...commits,
+      ].sort(
+        (
+          a: { created_at: string; assigned_at?: string; merged_at?: string },
+          b: { created_at: string; assigned_at?: string; merged_at?: string }
+        ) =>
+          dayjs(a.merged_at || a.assigned_at || a.created_at).isAfter(
+            dayjs(b.merged_at || b.assigned_at || b.created_at)
+          )
+            ? -1
+            : 1
       );
 
       setActivity({
@@ -416,6 +439,7 @@ export default function Home() {
         issues_assigned: assignedIssues,
         merged: mergedTimeline,
         commits: commits,
+        prs_merged: mergedPRData.items,
         error: "",
       });
       setFetchBtnState("success");
@@ -445,6 +469,12 @@ export default function Home() {
             <Icon component={GithubPRIcon} />
           </Tooltip>
         );
+      case "pr-merged":
+        return (
+          <Tooltip title="Pull Request Merged">
+            <CheckCircleTwoTone twoToneColor="#722ed1" />
+          </Tooltip>
+        );
       case "commit-created":
         return (
           <Tooltip title="Commit Created">
@@ -526,6 +556,18 @@ export default function Home() {
         })
       );
     }
+    if (checkedList.includes("PRs Merged")) {
+      todayActivities = todayActivities.concat(
+        activity.prs_merged.map((pr: any) => {
+          const key = dayjs(pr.merged_at || pr.created_at).format("YYYY-MM-DD");
+          groupedActivities[key] ??= [];
+          groupedActivities[key].push(
+            `- Merged PR [${getRepoName(pr.html_url)}#${pr.number}](${pr.html_url}): ${pr.title}`
+          );
+          return `- Merged PR [${getRepoName(pr.html_url)}#${pr.number}](${pr.html_url}): ${pr.title}`;
+        })
+      );
+    }
 
     let groupedActivitiesText = "";
 

From 5652e9f3fc5ec87ea46f8252804a1ca1e913928a Mon Sep 17 00:00:00 2001
From: abhimanyurajeesh <abhimanyurajeesh@gmail.com>
Date: Thu, 29 May 2025 11:33:42 +0530
Subject: [PATCH 03/10] Add repository and branch filters to GitHub activity
 report; enhance error handling and UI elements

---
 src/app/page.tsx | 221 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 194 insertions(+), 27 deletions(-)

diff --git a/src/app/page.tsx b/src/app/page.tsx
index 04cee19..d123632 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -96,6 +96,26 @@ export default function Home() {
     error: "",
   });
 
+  const [repoFilter, setRepoFilter] = useState<{
+    list: { name: string }[];
+    value: string;
+    error: string;
+  }>({
+    list: [],
+    value: "",
+    error: "",
+  });
+
+  const [branchFilter, setBranchFilter] = useState<{
+    list: { name: string }[];
+    value: string;
+    error: string;
+  }>({
+    list: [],
+    value: "",
+    error: "",
+  });
+
   const [activity, setActivity] = useState({
     prs: [],
     issues_created: [],
@@ -130,14 +150,18 @@ export default function Home() {
     const headers: { [key: string]: string } = {};
     if (settings.fetchGithubToken) {
       headers["Authorization"] = `token ${settings.fetchGithubToken}`;
+      headers["Accept"] = "application/vnd.github.v3+json";
+      console.log("Making request to:", url);
     }
     const res = await fetch(url, {
       headers,
     });
-    const data = await res.json();
-    if (data?.message) {
-      throw new Error(data.message);
+    if (!res.ok) {
+      const errorData = await res.json();
+      throw new Error(`GitHub API Error: ${errorData.message}`);
     }
+    const data = await res.json();
+    console.log("Response data:", data);
     return data;
   };
 
@@ -191,12 +215,25 @@ export default function Home() {
   };
 
   const saveFetchSettings = () => {
+    const token = githubTokenInput.trim();
+    if (!token) {
+      notify("error", "Invalid Token", "Please enter a valid GitHub token");
+      return;
+    }
+
     setSettings({
       ...settings,
-      fetchGithubToken: githubTokenInput,
+      fetchGithubToken: token,
     });
-    localStorage.setItem("githubToken", githubTokenInput);
+    localStorage.setItem("githubToken", token);
     setShowFetchSettings(false);
+
+    // Recheck username if it exists
+    if (usernameField.value) {
+      setTimeout(() => {
+        checkGithubUsername(usernameField.value);
+      }, 100);
+    }
   };
 
   const saveEODSettings = () => {
@@ -253,17 +290,18 @@ export default function Home() {
       state: "checking",
     });
     try {
-      const orgRes = await ghfetch(`https://api.github.com/users/${username}/orgs`);
-      if (orgRes?.message === "Not Found") {
-        setUsernameField({
-          ...usernameField,
-          value: username,
-          error: "Username not found",
-          state: "checked",
-        });
-        return false;
-      } else {
+      // First verify the user
+      const userRes = await ghfetch(`https://api.github.com/user`);
+      console.log("User data:", userRes);
+
+      // Then get their organizations
+      const orgRes = await ghfetch(`https://api.github.com/user/orgs`);
+      console.log("Org data:", orgRes);
+
+      if (Array.isArray(orgRes)) {
         const orgList = orgRes.map((org: { login: string }) => ({ login: org.login }));
+        console.log("Processed org list:", orgList);
+
         if (defaultOrg && orgList.find((org: { login: string }) => org.login === defaultOrg)) {
           setOrgFilter({
             value: defaultOrg,
@@ -277,20 +315,63 @@ export default function Home() {
             error: "",
           });
         }
+
         setUsernameField({
           ...usernameField,
           value: username,
           error: "",
           state: "checked",
         });
+
+        notify("success", "Organizations Found", `Found ${orgList.length} organizations`);
         return true;
+      } else {
+        throw new Error("Invalid response from GitHub API");
       }
     } catch (error: any) {
-      notify("error", "Error", "Something went wrong while fetching your organizations: " + error.message);
+      console.error("GitHub API Error:", error);
+      notify("error", "Error", `Failed to fetch organizations: ${error.message}`);
+      setUsernameField({
+        ...usernameField,
+        value: username,
+        error: error.message,
+        state: "checked",
+      });
     }
     return false;
   };
 
+  const fetchRepositories = async (org: string) => {
+    try {
+      const repoRes = await ghfetch(`https://api.github.com/orgs/${org}/repos`);
+      setRepoFilter({
+        value: "",
+        list: repoRes.map((repo: { name: string }) => ({ name: repo.name })),
+        error: "",
+      });
+      setBranchFilter({
+        value: "",
+        list: [],
+        error: "",
+      });
+    } catch (error: any) {
+      notify("error", "Error", "Something went wrong while fetching repositories: " + error.message);
+    }
+  };
+
+  const fetchBranches = async (org: string, repo: string) => {
+    try {
+      const branchRes = await ghfetch(`https://api.github.com/repos/${org}/${repo}/branches`);
+      setBranchFilter({
+        value: "",
+        list: branchRes.map((branch: { name: string }) => ({ name: branch.name })),
+        error: "",
+      });
+    } catch (error: any) {
+      notify("error", "Error", "Something went wrong while fetching branches: " + error.message);
+    }
+  };
+
   async function getLinkedPRs(issue_url: string) {
     if (!issue_url) return [];
     const linkedPRQuery = await fetch("/api/linkedprs", {
@@ -389,10 +470,22 @@ export default function Home() {
         }
       }
 
-      const commitsData = await ghfetch(
-        `https://api.github.com/search/commits?q=author:${usernameField.value}+committer-date:${dateField.value.startDate}..${dateField.value.endDate}${orgFilterQuery}&per_page=100`
-      );
-      const myCommits = commitsData.items.filter(
+      // Update commit fetching to use repository and branch if selected
+      let commitsUrl = `https://api.github.com/search/commits?q=author:${usernameField.value}+committer-date:${dateField.value.startDate}..${dateField.value.endDate}`;
+
+      if (orgFilter.value && repoFilter.value) {
+        commitsUrl = `https://api.github.com/repos/${orgFilter.value}/${repoFilter.value}/commits?author=${usernameField.value}&since=${dateField.value.startDate}&until=${dateField.value.endDate}`;
+        if (branchFilter.value) {
+          commitsUrl += `&sha=${branchFilter.value}`;
+        }
+      } else if (orgFilter.value) {
+        commitsUrl += `+org:${orgFilter.value}`;
+      }
+
+      commitsUrl += "&per_page=100";
+
+      const commitsData = await ghfetch(commitsUrl);
+      const myCommits = (commitsData.items || commitsData).filter(
         (commit: any) => commit.committer?.login?.toLowerCase() === usernameField.value.toLowerCase()
       );
       const commits: any = [];
@@ -494,6 +587,25 @@ export default function Home() {
     return url.replace("https://github.com/", "")?.split("/")?.[1] || "";
   }
 
+  function getRepoNameFromUrl(url: string | undefined): string {
+    if (!url) return "";
+    const parts = url.split("/");
+    if (url.includes("/repos/")) {
+      const repoIndex = parts.indexOf("repos");
+      if (repoIndex >= 0 && parts.length > repoIndex + 2) {
+        return parts[repoIndex + 2];
+      }
+    }
+    // For html_urls
+    if (url.includes("github.com/")) {
+      const githubIndex = parts.indexOf("github.com");
+      if (githubIndex >= 0 && parts.length > githubIndex + 2) {
+        return parts[githubIndex + 2];
+      }
+    }
+    return "";
+  }
+
   function getEODMessage() {
     let eodMessage = EOD_TEMPLATE;
     if (dayjs(dateField.value.startDate).format("YYYY-MM-DD") === dayjs(dateField.value.endDate).format("YYYY-MM-DD"))
@@ -628,10 +740,32 @@ export default function Home() {
               This is a simple EOD update generator that will help you to create a summary of your GitHub activity
             </Paragraph>
           </Typography>
+          <div className="grid grid-cols-6 gap-4 mb-2">
+            <div>
+              <Text strong>GitHub Username</Text>
+              <Paragraph className="text-xs text-gray-500">Enter your GitHub username</Paragraph>
+            </div>
+            <div>
+              <Text strong>Organization</Text>
+              <Paragraph className="text-xs text-gray-500">Select organization</Paragraph>
+            </div>
+            <div>
+              <Text strong>Repository</Text>
+              <Paragraph className="text-xs text-gray-500">Select repository</Paragraph>
+            </div>
+            <div>
+              <Text strong>Branch</Text>
+              <Paragraph className="text-xs text-gray-500">Select branch</Paragraph>
+            </div>
+            <div className="col-span-2">
+              <Text strong>Date Range</Text>
+              <Paragraph className="text-xs text-gray-500">Select time period</Paragraph>
+            </div>
+          </div>
           <Space.Compact className="w-full">
             <Input
               placeholder="GitHub username"
-              className="w-1/4"
+              className="w-1/6"
               value={usernameField.value}
               onChange={(e) => {
                 setUsernameField({ ...usernameField, value: e.target.value, error: "" });
@@ -656,17 +790,48 @@ export default function Home() {
             />
             <Select
               showSearch
-              className="w-1/4"
-              placeholder="Select an organization"
+              className="w-1/6"
+              placeholder="Select organization"
               optionFilterProp="children"
               onChange={(e) => {
                 setOrgFilter({ ...orgFilter, value: e });
+                fetchRepositories(e);
               }}
               value={orgFilter.value}
               filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
               options={orgFilter.list.map((org: { login: string }) => ({ label: org.login, value: org.login }))}
               disabled={usernameField.state !== "checked" || orgFilter.list.length === 0}
             />
+            <Select
+              showSearch
+              className="w-1/6"
+              placeholder="Select repository"
+              optionFilterProp="children"
+              onChange={(e) => {
+                setRepoFilter({ ...repoFilter, value: e });
+                fetchBranches(orgFilter.value, e);
+              }}
+              value={repoFilter.value}
+              filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
+              options={repoFilter.list.map((repo: { name: string }) => ({ label: repo.name, value: repo.name }))}
+              disabled={!orgFilter.value || repoFilter.list.length === 0}
+            />
+            <Select
+              showSearch
+              className="w-1/6"
+              placeholder="Select branch"
+              optionFilterProp="children"
+              onChange={(e) => {
+                setBranchFilter({ ...branchFilter, value: e });
+              }}
+              value={branchFilter.value}
+              filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
+              options={branchFilter.list.map((branch: { name: string }) => ({
+                label: branch.name,
+                value: branch.name,
+              }))}
+              disabled={!repoFilter.value || branchFilter.list.length === 0}
+            />
             <RangePicker
               className="w-1/2"
               presets={rangePresets}
@@ -733,13 +898,15 @@ export default function Home() {
                             className="italic w-[182px] whitespace-nowrap overflow-hidden overflow-ellipsis text-left"
                             style={{ direction: "rtl" }}
                           >
-                            {activity.repository_url?.split("/repos/")?.[1] ||
-                              activity.repository.full_name ||
-                              "-" + activity.type}
+                            {getRepoNameFromUrl(activity.repository_url || activity.html_url) || "-"}
                             <span className="font-medium">{"#" + (activity.number || activity.sha?.slice(0, 6))}</span>
                           </a>
                           {"  "}
-                          <p>{dayjs(activity.assigned_at || activity.created_at).format("Do MMMM YYYY h:mm A")}</p>
+                          <p>
+                            {dayjs(activity.merged_at || activity.assigned_at || activity.created_at).format(
+                              "Do MMMM YYYY h:mm A"
+                            )}
+                          </p>
                         </div>
                       ),
                       color: "green",

From 9a795e287840eb6e25ad8d7f5cb83a1b89d525d0 Mon Sep 17 00:00:00 2001
From: abhimanyurajeesh <abhimanyurajeesh@gmail.com>
Date: Thu, 29 May 2025 16:17:07 +0530
Subject: [PATCH 04/10] Refactor GitHub data fetching to prioritize public
 organizations, enhance error handling, and improve user notifications

---
 src/app/page.tsx | 100 ++++++++++++++++++++++++-----------------------
 1 file changed, 51 insertions(+), 49 deletions(-)

diff --git a/src/app/page.tsx b/src/app/page.tsx
index d123632..6eb22a3 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -290,47 +290,51 @@ export default function Home() {
       state: "checking",
     });
     try {
-      // First verify the user
-      const userRes = await ghfetch(`https://api.github.com/user`);
-      console.log("User data:", userRes);
-
-      // Then get their organizations
-      const orgRes = await ghfetch(`https://api.github.com/user/orgs`);
-      console.log("Org data:", orgRes);
-
-      if (Array.isArray(orgRes)) {
-        const orgList = orgRes.map((org: { login: string }) => ({ login: org.login }));
-        console.log("Processed org list:", orgList);
-
-        if (defaultOrg && orgList.find((org: { login: string }) => org.login === defaultOrg)) {
-          setOrgFilter({
-            value: defaultOrg,
-            list: orgList,
-            error: "",
-          });
-        } else {
-          setOrgFilter({
-            value: "",
-            list: orgList,
-            error: "",
-          });
+      // Try to get user's public organizations first
+      const publicOrgsRes = await ghfetch(`https://api.github.com/users/${username}/orgs`);
+      let orgList = publicOrgsRes.map((org: { login: string }) => ({ login: org.login }));
+
+      // If we have a token, try to get private organizations too
+      if (settings.fetchGithubToken) {
+        try {
+          const privateOrgsRes = await ghfetch(`https://api.github.com/user/orgs`);
+          if (Array.isArray(privateOrgsRes)) {
+            // Merge and deduplicate organizations
+            const allOrgs = [...orgList, ...privateOrgsRes];
+            orgList = Array.from(new Set(allOrgs.map((org) => org.login))).map((login) => ({ login }));
+          }
+        } catch (error) {
+          console.log("Could not fetch private organizations:", error);
+          // Continue with public orgs only
         }
+      }
 
-        setUsernameField({
-          ...usernameField,
-          value: username,
+      if (defaultOrg && orgList.find((org: { login: string }) => org.login === defaultOrg)) {
+        setOrgFilter({
+          value: defaultOrg,
+          list: orgList,
           error: "",
-          state: "checked",
         });
-
-        notify("success", "Organizations Found", `Found ${orgList.length} organizations`);
-        return true;
       } else {
-        throw new Error("Invalid response from GitHub API");
+        setOrgFilter({
+          value: "",
+          list: orgList,
+          error: "",
+        });
       }
+
+      setUsernameField({
+        ...usernameField,
+        value: username,
+        error: "",
+        state: "checked",
+      });
+
+      notify("success", "User Found", `Found ${orgList.length} organizations`);
+      return true;
     } catch (error: any) {
       console.error("GitHub API Error:", error);
-      notify("error", "Error", `Failed to fetch organizations: ${error.message}`);
+      notify("error", "Error", `Failed to fetch user data: ${error.message}`);
       setUsernameField({
         ...usernameField,
         value: username,
@@ -404,7 +408,7 @@ export default function Home() {
       return;
     }
 
-    notify("info", "Fetching", "Fetching your GitHub stats");
+    notify("info", "Fetching", "Fetching GitHub stats");
     const params = new URLSearchParams(searchParams.toString());
     const numDays = dayjs(dateField.value.endDate).diff(dayjs(dateField.value.startDate), "day");
     params.set("username", usernameField.value);
@@ -417,6 +421,7 @@ export default function Home() {
       orgFilterQuery = `+org:${orgFilter.value}`;
     }
     try {
+      // Use search API for public data which doesn't require authentication
       const issuesData = await ghfetch(
         `https://api.github.com/search/issues?q=author:${usernameField.value}+is:issue+created:${dateField.value.startDate}..${dateField.value.endDate}${orgFilterQuery}&per_page=100`
       );
@@ -470,22 +475,11 @@ export default function Home() {
         }
       }
 
-      // Update commit fetching to use repository and branch if selected
-      let commitsUrl = `https://api.github.com/search/commits?q=author:${usernameField.value}+committer-date:${dateField.value.startDate}..${dateField.value.endDate}`;
-
-      if (orgFilter.value && repoFilter.value) {
-        commitsUrl = `https://api.github.com/repos/${orgFilter.value}/${repoFilter.value}/commits?author=${usernameField.value}&since=${dateField.value.startDate}&until=${dateField.value.endDate}`;
-        if (branchFilter.value) {
-          commitsUrl += `&sha=${branchFilter.value}`;
-        }
-      } else if (orgFilter.value) {
-        commitsUrl += `+org:${orgFilter.value}`;
-      }
-
-      commitsUrl += "&per_page=100";
+      // Use search API for commits
+      const commitsUrl = `https://api.github.com/search/commits?q=author:${usernameField.value}+committer-date:${dateField.value.startDate}..${dateField.value.endDate}${orgFilterQuery}&per_page=100`;
 
       const commitsData = await ghfetch(commitsUrl);
-      const myCommits = (commitsData.items || commitsData).filter(
+      const myCommits = (commitsData.items || []).filter(
         (commit: any) => commit.committer?.login?.toLowerCase() === usernameField.value.toLowerCase()
       );
       const commits: any = [];
@@ -536,6 +530,14 @@ export default function Home() {
         error: "",
       });
       setFetchBtnState("success");
+
+      if (!settings.fetchGithubToken) {
+        notify(
+          "info",
+          "Limited Access",
+          "Using public data only. Add a GitHub token to see private repositories and organizations."
+        );
+      }
     } catch (error: any) {
       notify("error", "Error", "Something went wrong while fetching your GitHub stats: " + error.message);
       setFetchBtnState("error");
@@ -929,7 +931,7 @@ export default function Home() {
                 <div className="grid grid-cols-4">
                   <div className="col-span-3">
                     <Checkbox indeterminate={indeterminate} onChange={onCheckAllChange} checked={checkAll}>
-                      |
+                      Include All
                     </Checkbox>
                     <CheckboxGroup options={includeInEOD} value={checkedList} onChange={onChange} />
                   </div>

From 72f2ba6a4d3c07a78fc9a5968bd92f76f9e94a80 Mon Sep 17 00:00:00 2001
From: abhimanyurajeesh <abhimanyurajeesh@gmail.com>
Date: Thu, 29 May 2025 17:36:58 +0530
Subject: [PATCH 05/10] Mobile Version

---
 src/app/page.tsx | 384 ++++++++++++++++++++++++++++++-----------------
 1 file changed, 247 insertions(+), 137 deletions(-)

diff --git a/src/app/page.tsx b/src/app/page.tsx
index 6eb22a3..25a0b37 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -61,6 +61,25 @@ const EOD_TEMPLATE = `**EOD {{DATE}}** @{{ORGANIZATION}}
 **What's next?**
 {{TOMORROW_ACTIVITIES}}`;
 
+const globalStyles = `
+  .notification-compact {
+    padding: 8px 12px !important;
+  }
+  .notification-compact .ant-notification-notice-message {
+    margin-bottom: 0 !important;
+    font-size: 12px !important;
+  }
+  .notification-compact .ant-notification-notice-description {
+    font-size: 10px !important;
+  }
+  @media (max-width: 768px) {
+    .ant-notification-notice {
+      margin-right: 0 !important;
+      margin-left: 0 !important;
+    }
+  }
+`;
+
 export default function Home() {
   const [api, contextHolder] = notification.useNotification();
 
@@ -69,6 +88,12 @@ export default function Home() {
       message,
       description,
       duration: 3,
+      className: "notification-compact",
+      style: {
+        width: "auto",
+        minWidth: "250px",
+        maxWidth: "90vw",
+      },
     });
   };
 
@@ -731,6 +756,9 @@ export default function Home() {
 
   return (
     <>
+      <style jsx global>
+        {globalStyles}
+      </style>
       {contextHolder}
       <div className="py-6">
         <Card className="mx-auto max-w-5xl">
@@ -742,144 +770,217 @@ export default function Home() {
               This is a simple EOD update generator that will help you to create a summary of your GitHub activity
             </Paragraph>
           </Typography>
-          <div className="grid grid-cols-6 gap-4 mb-2">
-            <div>
+          <div className="grid grid-cols-2 md:grid-cols-6 gap-4 mb-2">
+            <div className="hidden md:block md:col-span-1">
               <Text strong>GitHub Username</Text>
               <Paragraph className="text-xs text-gray-500">Enter your GitHub username</Paragraph>
             </div>
-            <div>
+            <div className="hidden md:block md:col-span-1">
               <Text strong>Organization</Text>
               <Paragraph className="text-xs text-gray-500">Select organization</Paragraph>
             </div>
-            <div>
+            <div className="hidden md:block md:col-span-1">
               <Text strong>Repository</Text>
               <Paragraph className="text-xs text-gray-500">Select repository</Paragraph>
             </div>
-            <div>
+            <div className="hidden md:block md:col-span-1">
               <Text strong>Branch</Text>
               <Paragraph className="text-xs text-gray-500">Select branch</Paragraph>
             </div>
-            <div className="col-span-2">
+            <div className="hidden md:block md:col-span-2">
               <Text strong>Date Range</Text>
               <Paragraph className="text-xs text-gray-500">Select time period</Paragraph>
             </div>
           </div>
-          <Space.Compact className="w-full">
-            <Input
-              placeholder="GitHub username"
-              className="w-1/6"
-              value={usernameField.value}
-              onChange={(e) => {
-                setUsernameField({ ...usernameField, value: e.target.value, error: "" });
-              }}
-              status={usernameField.error ? "error" : undefined}
-              suffix={
-                (usernameField.state === "checking" && <LoadingOutlined />) ||
-                (usernameField.value &&
-                  usernameField.state === "checked" &&
-                  (usernameField.error ? (
-                    <CloseCircleTwoTone twoToneColor="#ff4d4f" />
-                  ) : (
-                    <CheckCircleTwoTone twoToneColor="#52c41a" />
-                  ))) || <span />
-              }
-              onBlur={() => {
-                checkGithubUsername(usernameField.value);
-              }}
-              onFocus={() => {
-                setUsernameField({ ...usernameField, state: "focus" });
-              }}
-            />
-            <Select
-              showSearch
-              className="w-1/6"
-              placeholder="Select organization"
-              optionFilterProp="children"
-              onChange={(e) => {
-                setOrgFilter({ ...orgFilter, value: e });
-                fetchRepositories(e);
-              }}
-              value={orgFilter.value}
-              filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
-              options={orgFilter.list.map((org: { login: string }) => ({ label: org.login, value: org.login }))}
-              disabled={usernameField.state !== "checked" || orgFilter.list.length === 0}
-            />
-            <Select
-              showSearch
-              className="w-1/6"
-              placeholder="Select repository"
-              optionFilterProp="children"
-              onChange={(e) => {
-                setRepoFilter({ ...repoFilter, value: e });
-                fetchBranches(orgFilter.value, e);
-              }}
-              value={repoFilter.value}
-              filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
-              options={repoFilter.list.map((repo: { name: string }) => ({ label: repo.name, value: repo.name }))}
-              disabled={!orgFilter.value || repoFilter.list.length === 0}
-            />
-            <Select
-              showSearch
-              className="w-1/6"
-              placeholder="Select branch"
-              optionFilterProp="children"
-              onChange={(e) => {
-                setBranchFilter({ ...branchFilter, value: e });
-              }}
-              value={branchFilter.value}
-              filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
-              options={branchFilter.list.map((branch: { name: string }) => ({
-                label: branch.name,
-                value: branch.name,
-              }))}
-              disabled={!repoFilter.value || branchFilter.list.length === 0}
-            />
-            <RangePicker
-              className="w-1/2"
-              presets={rangePresets}
-              showTime
-              status={dateField.error ? "error" : undefined}
-              format="DD/MM/YYYY HH:mm"
-              onChange={onRangeChange}
-              value={[
-                dateField.value.startDate ? dayjs(dateField.value.startDate) : null,
-                dateField.value.endDate ? dayjs(dateField.value.endDate) : null,
-              ]}
-            />
-            <Button
-              onClick={() => {
-                setShowFetchSettings(true);
-              }}
-              disabled={fetchBtnState === "loading"}
-            >
-              <SettingOutlined />
-            </Button>
-            <Button
-              type="primary"
-              icon={<SearchOutlined />}
-              onClick={fetchGithubStats}
-              loading={fetchBtnState === "loading"}
-            >
-              Fetch
-            </Button>
-          </Space.Compact>
-          {(usernameField.error || dateField.error) && (
-            <div className="mr-8">
-              <Text type="danger" className={`w-1/3 inline-block ${usernameField.error ? "visible" : "invisible"}`}>
-                {usernameField.error}
-              </Text>
-              <Text type="danger" className={`w-1/3 inline-block ${orgFilter.error ? "visible" : "invisible"}`}>
-                {orgFilter.error}
-              </Text>
-              <Text type="danger" className={`w-1/3 inline-block ${dateField.error ? "visible" : "invisible"}`}>
-                {dateField.error}
-              </Text>
+          <Space.Compact className="w-full flex-col md:flex-row space-y-2 md:space-y-0">
+            <div className="flex flex-col w-full md:w-1/6">
+              <div className="md:hidden mb-1">
+                <Text strong>GitHub Username</Text>
+                <Paragraph className="text-xs text-gray-500">Enter your GitHub username</Paragraph>
+              </div>
+              <Input
+                placeholder="GitHub username"
+                value={usernameField.value}
+                onChange={(e) => {
+                  setUsernameField({ ...usernameField, value: e.target.value, error: "" });
+                }}
+                status={usernameField.error ? "error" : undefined}
+                suffix={
+                  (usernameField.state === "checking" && <LoadingOutlined />) ||
+                  (usernameField.value &&
+                    usernameField.state === "checked" &&
+                    (usernameField.error ? (
+                      <CloseCircleTwoTone twoToneColor="#ff4d4f" />
+                    ) : (
+                      <CheckCircleTwoTone twoToneColor="#52c41a" />
+                    ))) || <span />
+                }
+                onBlur={() => {
+                  checkGithubUsername(usernameField.value);
+                }}
+                onFocus={() => {
+                  setUsernameField({ ...usernameField, state: "focus" });
+                }}
+              />
             </div>
-          )}
+            <div className="flex flex-col w-full md:w-1/6">
+              <div className="md:hidden mb-1">
+                <Text strong>Organization</Text>
+                <Paragraph className="text-xs text-gray-500">Select organization</Paragraph>
+              </div>
+              <Select
+                showSearch
+                placeholder="Select organization"
+                optionFilterProp="children"
+                onChange={(e) => {
+                  setOrgFilter({ ...orgFilter, value: e });
+                  fetchRepositories(e);
+                }}
+                value={orgFilter.value}
+                filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
+                options={orgFilter.list.map((org: { login: string }) => ({ label: org.login, value: org.login }))}
+                disabled={usernameField.state !== "checked" || orgFilter.list.length === 0}
+              />
+            </div>
+            <div className="flex flex-col w-full md:w-1/6">
+              <div className="md:hidden mb-1">
+                <Text strong>Repository</Text>
+                <Paragraph className="text-xs text-gray-500">Select repository</Paragraph>
+              </div>
+              <Select
+                showSearch
+                placeholder="Select repository"
+                optionFilterProp="children"
+                onChange={(e) => {
+                  setRepoFilter({ ...repoFilter, value: e });
+                  fetchBranches(orgFilter.value, e);
+                }}
+                value={repoFilter.value}
+                filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
+                options={repoFilter.list.map((repo: { name: string }) => ({ label: repo.name, value: repo.name }))}
+                disabled={!orgFilter.value || repoFilter.list.length === 0}
+              />
+            </div>
+            <div className="flex flex-col w-full md:w-1/6">
+              <div className="md:hidden mb-1">
+                <Text strong>Branch</Text>
+                <Paragraph className="text-xs text-gray-500">Select branch</Paragraph>
+              </div>
+              <Select
+                showSearch
+                placeholder="Select branch"
+                optionFilterProp="children"
+                onChange={(e) => {
+                  setBranchFilter({ ...branchFilter, value: e });
+                }}
+                value={branchFilter.value}
+                filterOption={(input, option) => (option?.label ?? "").toLowerCase().includes(input.toLowerCase())}
+                options={branchFilter.list.map((branch: { name: string }) => ({
+                  label: branch.name,
+                  value: branch.name,
+                }))}
+                disabled={!repoFilter.value || branchFilter.list.length === 0}
+              />
+            </div>
+            <div className="flex flex-col w-full md:w-1/3">
+              <div className="md:hidden mb-1">
+                <Text strong>Date Range</Text>
+                <Paragraph className="text-xs text-gray-500">Select time period</Paragraph>
+              </div>
+              <div className="md:hidden mb-2">
+                <Select
+                  className="w-full"
+                  placeholder="Quick select date range"
+                  onChange={(value) => {
+                    const now = dayjs();
+                    let startDate;
+                    switch (value) {
+                      case "1":
+                        startDate = now.subtract(1, "day");
+                        break;
+                      case "7":
+                        startDate = now.subtract(7, "days");
+                        break;
+                      case "14":
+                        startDate = now.subtract(14, "days");
+                        break;
+                      case "90":
+                        startDate = now.subtract(90, "days");
+                        break;
+                      default:
+                        return;
+                    }
+                    setDateField({
+                      ...dateField,
+                      error: "",
+                      value: {
+                        startDate: startDate.startOf("day").toISOString(),
+                        endDate: now.endOf("day").toISOString(),
+                      },
+                    });
+                  }}
+                  options={[
+                    { label: "Last 1 Day", value: "1" },
+                    { label: "Last 7 Days", value: "7" },
+                    { label: "Last 14 Days", value: "14" },
+                    { label: "Last 90 Days", value: "90" },
+                  ]}
+                />
+              </div>
+              <RangePicker
+                presets={rangePresets}
+                showTime
+                status={dateField.error ? "error" : undefined}
+                format="DD/MM/YYYY HH:mm"
+                onChange={onRangeChange}
+                inputReadOnly={true}
+                value={[
+                  dateField.value.startDate ? dayjs(dateField.value.startDate) : null,
+                  dateField.value.endDate ? dayjs(dateField.value.endDate) : null,
+                ]}
+              />
+            </div>
+            <div className="flex w-full md:w-auto space-x-2">
+              <Button
+                className="flex-1 md:flex-none"
+                onClick={() => {
+                  setShowFetchSettings(true);
+                }}
+                disabled={fetchBtnState === "loading"}
+              >
+                <SettingOutlined />
+              </Button>
+              <Button
+                type="primary"
+                icon={<SearchOutlined />}
+                onClick={fetchGithubStats}
+                loading={fetchBtnState === "loading"}
+                className="flex-1 md:flex-none"
+              >
+                Fetch
+              </Button>
+            </div>
+          </Space.Compact>
+
+          {/* Error messages */}
+          <div className="grid grid-cols-1 md:grid-cols-3 gap-2 mt-2">
+            <Text type="danger" className={usernameField.error ? "visible" : "invisible"}>
+              {usernameField.error}
+            </Text>
+            <Text type="danger" className={orgFilter.error ? "visible" : "invisible"}>
+              {orgFilter.error}
+            </Text>
+            <Text type="danger" className={dateField.error ? "visible" : "invisible"}>
+              {dateField.error}
+            </Text>
+          </div>
+
           <Divider />
+
+          {/* Activity Timeline */}
           {fetchBtnState === "success" &&
             (activity.merged.length > 0 ? (
-              <div className="">
+              <div>
                 <ConfigProvider
                   theme={{
                     token: {
@@ -890,30 +991,30 @@ export default function Home() {
                   <Timeline
                     mode="left"
                     reverse
+                    className="px-2 md:px-4"
                     items={activity.merged.map((activity: any) => ({
                       label: (
-                        <div className="flex justify-between">
+                        <div className="flex justify-between mr-1">
                           <a
                             href={activity.html_url}
                             target="_blank"
                             rel="noreferrer"
-                            className="italic w-[182px] whitespace-nowrap overflow-hidden overflow-ellipsis text-left"
-                            style={{ direction: "rtl" }}
+                            className="italic text-left truncate max-w-[200px]"
                           >
                             {getRepoNameFromUrl(activity.repository_url || activity.html_url) || "-"}
                             <span className="font-medium">{"#" + (activity.number || activity.sha?.slice(0, 6))}</span>
                           </a>
                           {"  "}
-                          <p>
+                          <p className="text-xs text-gray-500">
                             {dayjs(activity.merged_at || activity.assigned_at || activity.created_at).format(
-                              "Do MMMM YYYY h:mm A"
+                              "DD MMM, h:mm A"
                             )}
                           </p>
                         </div>
                       ),
                       color: "green",
                       dot: getTimelineDot(activity.type),
-                      children: activity.title,
+                      children: <div className="break-words text-sm pr-2">{activity.title}</div>,
                     }))}
                   />
                 </ConfigProvider>
@@ -923,19 +1024,28 @@ export default function Home() {
                 <Text type="secondary">No activity found</Text>
               </div>
             ))}
+
+          {/* EOD Options */}
           {activity.merged.length > 0 && (
             <>
               <Divider className="my-1" />
               <div className="flex flex-col mb-3">
                 <p className="text-md text-gray-500 font-semibold mt-2">Include in EOD</p>
-                <div className="grid grid-cols-4">
-                  <div className="col-span-3">
-                    <Checkbox indeterminate={indeterminate} onChange={onCheckAllChange} checked={checkAll}>
-                      Include All
-                    </Checkbox>
-                    <CheckboxGroup options={includeInEOD} value={checkedList} onChange={onChange} />
+                <div className="grid grid-cols-1 md:grid-cols-4 gap-4">
+                  <div className="col-span-1 md:col-span-3">
+                    <div className="flex flex-col space-y-2">
+                      <Checkbox indeterminate={indeterminate} onChange={onCheckAllChange} checked={checkAll}>
+                        Include All
+                      </Checkbox>
+                      <CheckboxGroup
+                        options={includeInEOD}
+                        value={checkedList}
+                        onChange={onChange}
+                        className="flex space-y-1"
+                      />
+                    </div>
                   </div>
-                  <Space.Compact className="col-span-1 mr-0 ml-auto">
+                  <Space.Compact className="col-span-1 flex justify-end mt-4 md:mt-0">
                     <Button
                       type="primary"
                       icon={<SettingOutlined />}
@@ -946,7 +1056,6 @@ export default function Home() {
                     />
                     <Button
                       type="primary"
-                      className="float-right"
                       onClick={() => {
                         setEODMessage(getEODMessage());
                       }}
@@ -958,18 +1067,19 @@ export default function Home() {
               </div>
             </>
           )}
+
+          {/* EOD Preview */}
           {EODMessage && (
-            <div>
-              <TextArea
+            <div className="space-y-4">
+              {/* <TextArea
                 value={EODMessage}
                 autoSize
                 onChange={(e) => {
                   setEODMessage(e.target.value);
                 }}
-              />
-              <div className="my-4"></div>
+              /> */}
               <MarkdownPreview
-                className="border border-gray-300 rounded-lg p-2"
+                className="border border-gray-300 rounded-lg p-2 overflow-x-auto"
                 source={EODMessage}
                 wrapperElement={{
                   "data-color-mode": "light",

From 4d7ec615fbdec20f64c0003d34daa508f79390ac Mon Sep 17 00:00:00 2001
From: abhimanyurajeesh <abhimanyurajeesh@gmail.com>
Date: Tue, 3 Jun 2025 10:30:53 +0530
Subject: [PATCH 06/10] Refactor GitHub commits fetching logic to support
 repository and branch filters, while maintaining compatibility with the
 search API response format.

---
 src/app/page.tsx | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/app/page.tsx b/src/app/page.tsx
index 25a0b37..691cc94 100644
--- a/src/app/page.tsx
+++ b/src/app/page.tsx
@@ -501,10 +501,22 @@ export default function Home() {
       }
 
       // Use search API for commits
-      const commitsUrl = `https://api.github.com/search/commits?q=author:${usernameField.value}+committer-date:${dateField.value.startDate}..${dateField.value.endDate}${orgFilterQuery}&per_page=100`;
+      let commitsUrl;
+      if (orgFilter.value && repoFilter.value) {
+        // If both org and repo are selected, use the repos API
+        commitsUrl = `https://api.github.com/repos/${orgFilter.value}/${repoFilter.value}/commits?author=${usernameField.value}&since=${dateField.value.startDate}&until=${dateField.value.endDate}`;
+        if (branchFilter.value) {
+          commitsUrl += `&sha=${branchFilter.value}`;
+        }
+      } else {
+        // Otherwise use the search API
+        commitsUrl = `https://api.github.com/search/commits?q=author:${usernameField.value}+committer-date:${dateField.value.startDate}..${dateField.value.endDate}${orgFilterQuery}&per_page=100`;
+      }
 
       const commitsData = await ghfetch(commitsUrl);
-      const myCommits = (commitsData.items || []).filter(
+      // Handle both search API and repos API responses
+      const commitsArray = commitsUrl.includes("/search/") ? commitsData.items : commitsData;
+      const myCommits = (commitsArray || []).filter(
         (commit: any) => commit.committer?.login?.toLowerCase() === usernameField.value.toLowerCase()
       );
       const commits: any = [];

From f50e92b247b5097a5ba1f7850211211fa0a75c46 Mon Sep 17 00:00:00 2001
From: abhimanyurajeesh <abhimanyurajeesh@gmail.com>
Date: Thu, 7 Aug 2025 13:20:41 +0530
Subject: [PATCH 07/10] Enhance README.md to provide comprehensive details on
 GitHub activity report generation and downloading features, including
 installation instructions, usage guidelines, and API endpoint documentation.

---
 README.md                            | 135 ++++--
 src/app/api/github-activity/route.ts | 130 ++++++
 src/app/download/page.tsx            | 590 +++++++++++++++++++++++++++
 3 files changed, 828 insertions(+), 27 deletions(-)
 create mode 100644 src/app/api/github-activity/route.ts
 create mode 100644 src/app/download/page.tsx

diff --git a/README.md b/README.md
index 4d9ab12..ca46ace 100644
--- a/README.md
+++ b/README.md
@@ -1,57 +1,138 @@
 # GitHub Activity Report
 
-This is a simple End of Day (EOD) update generator that helps you create a summary of your GitHub activity. Built using Next.js, this app provides a clean and organized way to track your daily progress on GitHub.
-
-![image](https://github.com/Ashesh3/github-activity/assets/3626859/c8aeff4d-e69e-44ed-91f1-f18e5b0bc36e)
+A comprehensive tool for generating GitHub activity reports and downloading repository activity data with customizable filters.
 
 ## Features
 
-- Generate EOD updates for your GitHub activity
-- Track pull requests created, issues created, issues assigned, and commits made
-- Quickly review your activity for the day or a specific time period
+### 1. Activity Report Generator
+- Generate EOD (End of Day) reports from your GitHub activity
+- Track pull requests, issues, commits, and more
+- Customizable date ranges and organization filters
+- Export reports in markdown format
+
+### 2. Activity Downloader (New!)
+- Download repository activity data with customizable filters
+- Support for multiple activity types: Pull Requests, Issues, Commits, Releases, Discussions
+- Filter by date range, authors, labels, and state
+- Export in CSV, JSON, or Excel formats
+- Real-time progress tracking during downloads
 
 ## Getting Started
 
-To run the project locally, follow these steps:
+### Prerequisites
+- Node.js 18+ 
+- npm or yarn
 
-1. Clone the repository:
+### Installation
 
+1. Clone the repository:
 ```bash
-git clone https://github.com/Ashesh3/github-activity-report.git
+git clone <repository-url>
+cd github-activity
 ```
 
-2. Change the directory to the project folder:
-
-```bash
-cd github-activity-report
-```
-
-3. Install the dependencies:
-
+2. Install dependencies:
 ```bash
 npm install
 ```
 
-4. Run the development server:
-
+3. Run the development server:
 ```bash
 npm run dev
 ```
 
-5. Open your browser and navigate to [http://localhost:3000 ↗](http://localhost:3000) to view the app.
+4. Open [http://localhost:3000](http://localhost:3000) in your browser.
 
 ## Usage
 
-1. Enter your GitHub username and the time range for which you want to generate the report.
-2. Click the "Generate Report" button.
-3. Review your GitHub activity, including pull requests, issues, and commits.
-4. Edit the generated EOD update text as needed.
-5. Share your EOD update with your team or save it for your records.
+### Activity Report Generator
+
+1. **Enter GitHub Username**: Enter your GitHub username to fetch your activity
+2. **Select Organization**: Choose an organization to filter activity (optional)
+3. **Set Date Range**: Select the time period for your activity report
+4. **Configure Settings**: Add your GitHub token for private repository access
+5. **Generate Report**: Click "Fetch" to generate your activity timeline
+6. **Customize EOD**: Select which activities to include in your EOD report
+7. **Export**: Copy the generated markdown report
+
+### Activity Downloader
+
+1. **Enter Repository**: Enter a repository URL or owner/repo format (e.g., `ohcnetwork/care_fe`)
+2. **Set Date Range**: Choose the time period for activity data
+3. **Select Activity Types**: Choose which types of activity to download:
+   - Pull Requests
+   - Issues
+   - Commits
+   - Releases
+   - Discussions
+4. **Apply Filters**: Filter by state, authors, and labels
+5. **Choose Format**: Select CSV, JSON, or Excel format
+6. **Download**: Click "Download Activity" to get your data
+
+## Supported Repository Formats
+
+The downloader supports various repository input formats:
+- Full URL: `https://github.com/ohcnetwork/care_fe`
+- Owner/Repo: `ohcnetwork/care_fe`
+- Any public or private repository (with GitHub token)
+
+## GitHub Token Setup
+
+For enhanced functionality and access to private repositories:
+
+1. Go to [GitHub Settings > Developer settings > Personal access tokens](https://github.com/settings/tokens)
+2. Generate a new token with appropriate permissions:
+   - `repo` (for private repositories)
+   - `read:org` (for organization access)
+3. Copy the token and paste it in the settings modal
+4. The token will be saved locally for future use
+
+## API Endpoints
+
+### `/api/github-activity`
+POST endpoint for fetching repository activity data.
+
+**Request Body:**
+```json
+{
+  "owner": "string",
+  "repo": "string", 
+  "activityTypes": ["pull_requests", "issues", "commits"],
+  "startDate": "YYYY-MM-DD",
+  "endDate": "YYYY-MM-DD",
+  "state": "all|open|closed",
+  "authors": ["username1", "username2"],
+  "labels": ["label1", "label2"],
+  "githubToken": "optional_token"
+}
+```
+
+**Response:**
+```json
+{
+  "success": true,
+  "data": [...],
+  "total": 42,
+  "repository": "owner/repo"
+}
+```
+
+## Technologies Used
+
+- **Next.js 14** - React framework
+- **Ant Design** - UI components
+- **Day.js** - Date manipulation
+- **TypeScript** - Type safety
+- **Tailwind CSS** - Styling
 
 ## Contributing
 
-Contributions are welcome! Feel free to submit a pull request or open an issue for any bugs or feature requests.
+1. Fork the repository
+2. Create a feature branch
+3. Make your changes
+4. Add tests if applicable
+5. Submit a pull request
 
 ## License
 
-This project is licensed under the MIT License. See the [LICENSE](./LICENSE) file for more information.
\ No newline at end of file
+This project is licensed under the MIT License.
\ No newline at end of file
diff --git a/src/app/api/github-activity/route.ts b/src/app/api/github-activity/route.ts
new file mode 100644
index 0000000..c63ec8e
--- /dev/null
+++ b/src/app/api/github-activity/route.ts
@@ -0,0 +1,130 @@
+import { NextRequest, NextResponse } from "next/server";
+
+export async function POST(request: NextRequest) {
+  try {
+    const body = await request.json();
+    const { owner, repo, activityTypes, startDate, endDate, state = "all", githubToken } = body;
+
+    if (!owner || !repo) {
+      return NextResponse.json({ error: "Owner and repository are required" }, { status: 400 });
+    }
+
+    const headers: { [key: string]: string } = {
+      Accept: "application/vnd.github.v3+json",
+    };
+
+    if (githubToken) {
+      headers["Authorization"] = `token ${githubToken}`;
+    }
+
+    const allData: any[] = [];
+
+    // Fetch different types of activity
+    for (const activityType of activityTypes) {
+      try {
+        let url = "";
+        const params = new URLSearchParams();
+
+        switch (activityType) {
+          case "pull_requests":
+            url = `https://api.github.com/repos/${owner}/${repo}/pulls`;
+            // For PRs, we need to handle merged state differently
+            if (state === "merged") {
+              params.set("state", "closed");
+            } else {
+              params.set("state", state === "all" ? "all" : state);
+            }
+            params.set("per_page", "100");
+            break;
+
+          case "issues":
+            url = `https://api.github.com/repos/${owner}/${repo}/issues`;
+            params.set("state", state === "all" ? "all" : state);
+            params.set("per_page", "100");
+            break;
+
+          case "commits":
+            url = `https://api.github.com/repos/${owner}/${repo}/commits`;
+            params.set("since", startDate);
+            params.set("until", endDate);
+            params.set("per_page", "100");
+            break;
+
+          case "releases":
+            url = `https://api.github.com/repos/${owner}/${repo}/releases`;
+            params.set("per_page", "100");
+            break;
+
+          case "discussions":
+            url = `https://api.github.com/repos/${owner}/${repo}/discussions`;
+            params.set("per_page", "100");
+            break;
+
+          default:
+            continue;
+        }
+
+        const response = await fetch(`${url}?${params.toString()}`, { headers });
+
+        if (!response.ok) {
+          if (activityType === "discussions" && response.status === 404) {
+            // Discussions might not be enabled for this repository
+            continue;
+          }
+          throw new Error(`GitHub API Error: ${response.status} ${response.statusText}`);
+        }
+
+        const data = await response.json();
+
+        // Add type identifier to each item
+        const typedData = data.map((item: any) => ({
+          ...item,
+          type: activityType,
+        }));
+
+        allData.push(...typedData);
+      } catch (error: any) {
+        console.error(`Error fetching ${activityType}:`, error);
+        // Continue with other activity types even if one fails
+      }
+    }
+
+    // Apply date range filter
+    let filteredData = allData;
+
+    if (startDate && endDate) {
+      filteredData = filteredData.filter((item: any) => {
+        const itemDate = item.created_at || item.commit?.author?.date;
+        if (!itemDate) return false;
+
+        const date = new Date(itemDate);
+        const start = new Date(startDate);
+        const end = new Date(endDate);
+
+        return date >= start && date <= end;
+      });
+    }
+
+    // Filter for merged PRs if state is "merged"
+    if (state === "merged") {
+      filteredData = filteredData.filter((item: any) => {
+        // For pull requests, check if they have a merged_at date
+        if (item.type === "pull_requests") {
+          return item.merged_at != null;
+        }
+        // For issues, merged state doesn't apply
+        return false;
+      });
+    }
+
+    return NextResponse.json({
+      success: true,
+      data: filteredData,
+      total: filteredData.length,
+      repository: `${owner}/${repo}`,
+    });
+  } catch (error: any) {
+    console.error("GitHub Activity API Error:", error);
+    return NextResponse.json({ error: error.message || "Internal server error" }, { status: 500 });
+  }
+}
diff --git a/src/app/download/page.tsx b/src/app/download/page.tsx
new file mode 100644
index 0000000..603e73c
--- /dev/null
+++ b/src/app/download/page.tsx
@@ -0,0 +1,590 @@
+"use client";
+
+import React, { useEffect, useState } from "react";
+import {
+  Button,
+  Card,
+  Checkbox,
+  DatePicker,
+  Divider,
+  Input,
+  Select,
+  Space,
+  notification,
+  Typography,
+  Modal,
+  Form,
+  Radio,
+  Switch,
+  Progress,
+} from "antd";
+import Icon, { DownloadOutlined, SettingOutlined, CheckCircleTwoTone, CloseCircleTwoTone } from "@ant-design/icons";
+import dayjs from "dayjs";
+import type { Dayjs } from "dayjs";
+import Title from "antd/es/typography/Title";
+import Paragraph from "antd/es/typography/Paragraph";
+import { useRouter } from "next/navigation";
+
+const { Text } = Typography;
+const { RangePicker } = DatePicker;
+
+const rangePresets: {
+  label: string;
+  value: [Dayjs, Dayjs];
+}[] = [
+  { label: "Last 1 Day", value: [dayjs().add(-1, "d"), dayjs()] },
+  { label: "Last 7 Days", value: [dayjs().add(-7, "d"), dayjs()] },
+  { label: "Last 14 Days", value: [dayjs().add(-30, "d"), dayjs()] },
+  { label: "Last 90 Days", value: [dayjs().add(-90, "d"), dayjs()] },
+];
+
+type NotificationType = "success" | "info" | "warning" | "error";
+
+const globalStyles = `
+  .notification-compact {
+    padding: 8px 12px !important;
+  }
+  .notification-compact .ant-notification-notice-message {
+    margin-bottom: 0 !important;
+    font-size: 12px !important;
+  }
+  .notification-compact .ant-notification-notice-description {
+    font-size: 10px !important;
+  }
+  @media (max-width: 768px) {
+    .ant-notification-notice {
+      margin-right: 0 !important;
+      margin-left: 0 !important;
+    }
+  }
+`;
+
+interface ActivityFilters {
+  repository: string;
+  dateRange: [Dayjs, Dayjs] | null;
+  activityTypes: string[];
+  state: "all" | "open" | "closed" | "merged";
+  format: "csv" | "json";
+  selectedFields: string[];
+}
+
+export default function DownloadPage() {
+  const [api, contextHolder] = notification.useNotification();
+  const router = useRouter();
+
+  const notify = (type: NotificationType, message: string, description: string) => {
+    api[type]({
+      message,
+      description,
+      duration: 3,
+      className: "notification-compact",
+      style: {
+        width: "auto",
+        minWidth: "250px",
+        maxWidth: "90vw",
+      },
+    });
+  };
+
+  const [githubTokenInput, setGithubTokenInput] = useState("");
+  const [settings, setSettings] = useState({
+    fetchGithubToken: "",
+  });
+
+  const [filters, setFilters] = useState<ActivityFilters>({
+    repository: "",
+    dateRange: null,
+    activityTypes: ["pull_requests", "issues"],
+    state: "all",
+    format: "csv",
+    selectedFields: [
+      "number",
+      "title",
+      "type",
+      "state",
+      "author",
+      "created_at",
+      "merged_at",
+      "labels",
+      "assignees",
+      "html_url",
+    ],
+  });
+
+  const [downloadProgress, setDownloadProgress] = useState(0);
+  const [isDownloading, setIsDownloading] = useState(false);
+  const [parsedRepo, setParsedRepo] = useState<{ owner: string; repo: string } | null>(null);
+
+  const activityTypeOptions = [
+    { label: "Pull Requests", value: "pull_requests" },
+    { label: "Issues", value: "issues" },
+  ];
+
+  const formatOptions = [
+    { label: "CSV", value: "csv" },
+    { label: "JSON", value: "json" },
+  ];
+
+  const fieldOptions = [
+    { label: "Number", value: "number" },
+    { label: "Title", value: "title" },
+    { label: "Type", value: "type" },
+    { label: "State", value: "state" },
+    { label: "Author", value: "author" },
+    { label: "Created At", value: "created_at" },
+    { label: "Merged At", value: "merged_at" },
+    { label: "Labels", value: "labels" },
+    { label: "Assignees", value: "assignees" },
+    { label: "URL", value: "html_url" },
+  ];
+
+  useEffect(() => {
+    const githubToken = localStorage.getItem("githubToken");
+    if (githubToken) {
+      setGithubTokenInput(githubToken);
+      setSettings({
+        ...settings,
+        fetchGithubToken: githubToken,
+      });
+    }
+  }, []);
+
+  const parseRepositoryUrl = (url: string) => {
+    const patterns = [/github\.com\/([^/]+)\/([^/?]+)/, /^([^/]+)\/([^/]+)$/];
+
+    for (const pattern of patterns) {
+      const match = url.match(pattern);
+      if (match) {
+        return {
+          owner: match[1],
+          repo: match[2].replace(".git", ""),
+        };
+      }
+    }
+    return null;
+  };
+
+  const handleRepositoryChange = (value: string) => {
+    setFilters({ ...filters, repository: value });
+    const parsed = parseRepositoryUrl(value);
+    setParsedRepo(parsed);
+  };
+
+  const saveFetchSettings = () => {
+    const token = githubTokenInput.trim();
+    if (!token) {
+      notify("error", "Invalid Token", "Please enter a valid GitHub token");
+      return;
+    }
+
+    setSettings({
+      ...settings,
+      fetchGithubToken: token,
+    });
+    localStorage.setItem("githubToken", token);
+    notify("success", "Settings Saved", "GitHub token has been saved");
+  };
+
+  const downloadActivity = async () => {
+    if (!filters.repository) {
+      notify("error", "Repository Required", "Please enter a repository URL or owner/repo");
+      return;
+    }
+
+    if (!filters.dateRange) {
+      notify("error", "Date Range Required", "Please select a date range");
+      return;
+    }
+
+    if (!parsedRepo) {
+      notify("error", "Invalid Repository", "Please enter a valid repository URL or owner/repo format");
+      return;
+    }
+
+    setIsDownloading(true);
+    setDownloadProgress(0);
+
+    try {
+      const { owner, repo } = parsedRepo;
+      const startDate = filters.dateRange[0].format("YYYY-MM-DD");
+      const endDate = filters.dateRange[1].format("YYYY-MM-DD");
+
+      setDownloadProgress(25);
+
+      // Use the new API endpoint
+      const response = await fetch("/api/github-activity", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          owner,
+          repo,
+          activityTypes: filters.activityTypes,
+          startDate,
+          endDate,
+          state: filters.state,
+          githubToken: settings.fetchGithubToken,
+        }),
+      });
+
+      setDownloadProgress(75);
+
+      if (!response.ok) {
+        const errorData = await response.json();
+        throw new Error(errorData.error || "Failed to fetch activity data");
+      }
+
+      const result = await response.json();
+      const allData = result.data;
+
+      // Flatten the data structure with all possible fields
+      const allFieldsData = allData.map((item: any, index: number) => ({
+        slno: (index + 1).toString(),
+        number: item.number || item.sha?.slice(0, 7) || "",
+        title: item.title || item.commit?.message?.split("\n")[0] || "",
+        type: item.type,
+        state: item.state || item.merged_at ? "merged" : "open",
+        author: item.user?.login || item.author?.login || item.commit?.author?.name || "",
+        created_at: item.created_at || item.commit?.author?.date || "",
+        merged_at: item.merged_at || "",
+        labels: item.labels?.map((l: any) => l.name).join(", ") || "",
+        assignees: item.assignees?.map((a: any) => a.login).join(", ") || "",
+        html_url: item.html_url || "",
+      }));
+
+      // Filter data to only include selected fields, but always include slno
+      const flatData = allFieldsData.map((item: any) => {
+        const filteredItem: any = { slno: item.slno }; // Always include serial number
+        filters.selectedFields.forEach((field) => {
+          filteredItem[field] = item[field];
+        });
+        return filteredItem;
+      });
+
+      setDownloadProgress(100);
+
+      // Generate download file
+      let downloadContent = "";
+      let filename = `${owner}-${repo}-activity-${startDate}-to-${endDate}`;
+
+      switch (filters.format) {
+        case "csv":
+          downloadContent = generateCSV(flatData);
+          filename += ".csv";
+          break;
+        case "json":
+          downloadContent = JSON.stringify(flatData, null, 2);
+          filename += ".json";
+          break;
+      }
+
+      // Create and download file
+      const blob = new Blob([downloadContent], { type: "text/plain" });
+      const url = window.URL.createObjectURL(blob);
+      const a = document.createElement("a");
+      a.href = url;
+      a.download = filename;
+      document.body.appendChild(a);
+      a.click();
+      window.URL.revokeObjectURL(url);
+      document.body.removeChild(a);
+
+      notify("success", "Download Complete", `Downloaded ${flatData.length} items from ${owner}/${repo}`);
+    } catch (error: any) {
+      notify("error", "Download Failed", error.message);
+    } finally {
+      setIsDownloading(false);
+      setDownloadProgress(0);
+    }
+  };
+
+  const generateCSV = (data: any[]) => {
+    if (data.length === 0) return "";
+
+    // Always include slno as first column, then selected fields
+    const headers = ["slno", ...filters.selectedFields];
+    const csvRows = [headers.join(",")];
+
+    data.forEach((item) => {
+      const row = headers.map((header) => {
+        const value = item[header];
+        if (value === null || value === undefined) return "";
+        return `"${String(value).replace(/"/g, '""')}"`;
+      });
+      csvRows.push(row.join(","));
+    });
+
+    return csvRows.join("\n");
+  };
+
+  return (
+    <>
+      <style jsx global>
+        {globalStyles}
+      </style>
+      {contextHolder}
+      <div className="py-8 px-4">
+        <Card className="mx-auto max-w-5xl shadow-lg border-0">
+          <div className="flex justify-between items-center mb-8">
+            <div>
+              <Title level={4} className="mb-2 text-gray-800">
+                <DownloadOutlined className="mr-3 text-blue-500" />
+                GitHub Activity Downloader
+              </Title>
+              <Paragraph className="text-sm text-gray-600">
+                Download repository activity with customizable data structure
+              </Paragraph>
+            </div>
+            <Button type="default" onClick={() => router.push("/")} className="flex items-center">
+              ← Back to Activity Report
+            </Button>
+          </div>
+
+          <Form layout="vertical" className="space-y-6">
+            <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
+              {/* Repository Input */}
+              <div className="bg-gray-50 p-6 rounded-lg">
+                <Form.Item label={<span className="text-gray-700 font-medium">Repository</span>} required>
+                  <Input
+                    placeholder="Enter repository URL or owner/repo (e.g., ohcnetwork/care_fe)"
+                    value={filters.repository}
+                    onChange={(e) => handleRepositoryChange(e.target.value)}
+                    status={filters.repository && !parsedRepo ? "error" : undefined}
+                    suffix={
+                      filters.repository && parsedRepo ? (
+                        <CheckCircleTwoTone twoToneColor="#52c41a" />
+                      ) : filters.repository && !parsedRepo ? (
+                        <CloseCircleTwoTone twoToneColor="#ff4d4f" />
+                      ) : (
+                        <span />
+                      )
+                    }
+                  />
+                  {parsedRepo && (
+                    <div className="mt-2 p-2 bg-green-50 border border-green-200 rounded">
+                      <Text className="text-green-700 text-sm">
+                        ✓ Repository: {parsedRepo.owner}/{parsedRepo.repo}
+                      </Text>
+                    </div>
+                  )}
+                </Form.Item>
+              </div>
+
+              {/* Date Range */}
+              <div className="bg-gray-50 p-6 rounded-lg">
+                <Form.Item label={<span className="text-gray-700 font-medium">Date Range</span>} required>
+                  <RangePicker
+                    presets={rangePresets}
+                    showTime
+                    format="DD/MM/YYYY HH:mm"
+                    value={filters.dateRange}
+                    onChange={(dates) => setFilters({ ...filters, dateRange: dates as [Dayjs, Dayjs] | null })}
+                    className="w-full"
+                  />
+                </Form.Item>
+              </div>
+
+              {/* Activity Types */}
+              <div className="bg-gray-50 p-6 rounded-lg">
+                <Form.Item label={<span className="text-gray-700 font-medium">Activity Types</span>}>
+                  <Checkbox.Group
+                    options={activityTypeOptions}
+                    value={filters.activityTypes}
+                    onChange={(values) => setFilters({ ...filters, activityTypes: values as string[] })}
+                  />
+                </Form.Item>
+              </div>
+
+              {/* State Filter */}
+              <div className="bg-gray-50 p-6 rounded-lg">
+                <Form.Item label={<span className="text-gray-700 font-medium">State</span>}>
+                  <Radio.Group
+                    value={filters.state}
+                    onChange={(e) => setFilters({ ...filters, state: e.target.value })}
+                  >
+                    <Radio value="all">All</Radio>
+                    <Radio value="open">Open</Radio>
+                    <Radio value="closed">Closed</Radio>
+                    <Radio value="merged">Merged</Radio>
+                  </Radio.Group>
+                </Form.Item>
+              </div>
+
+              {/* Download Format */}
+              <div className="bg-gray-50 p-6 rounded-lg">
+                <Form.Item label={<span className="text-gray-700 font-medium">Download Format</span>}>
+                  <Radio.Group
+                    value={filters.format}
+                    onChange={(e) => setFilters({ ...filters, format: e.target.value })}
+                    className="space-y-2"
+                  >
+                    {formatOptions.map((option) => (
+                      <Radio key={option.value} value={option.value}>
+                        {option.label}
+                      </Radio>
+                    ))}
+                  </Radio.Group>
+                </Form.Item>
+              </div>
+            </div>
+
+            {/* Field Selection */}
+            <div className="bg-blue-50 p-6 rounded-lg border border-blue-200">
+              <Form.Item label={<span className="text-blue-800 font-medium">Select Fields to Include</span>}>
+                <div className="bg-white p-4 rounded border">
+                  <Checkbox.Group
+                    options={fieldOptions}
+                    value={filters.selectedFields}
+                    onChange={(values) => setFilters({ ...filters, selectedFields: values as string[] })}
+                    className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-5 gap-3"
+                  />
+                </div>
+              </Form.Item>
+            </div>
+
+            {/* Settings and Download Buttons */}
+            <div className="flex justify-between items-center mt-8 p-6 bg-gradient-to-r from-blue-50 to-indigo-50 rounded-lg border">
+              <div>
+                <Button
+                  onClick={() => {
+                    const modal = Modal.info({
+                      title: "GitHub Settings",
+                      content: (
+                        <div>
+                          <Text>GitHub Access Token</Text>
+                          <Input
+                            placeholder="ghp_**********"
+                            className="mt-2"
+                            value={githubTokenInput}
+                            onChange={(e) => setGithubTokenInput(e.target.value)}
+                          />
+                          <Paragraph className="text-xs text-gray-500 mt-2">
+                            Add a GitHub token to access private repositories and increase API rate limits
+                          </Paragraph>
+                        </div>
+                      ),
+                      onOk: saveFetchSettings,
+                    });
+                  }}
+                  size="large"
+                  className="flex items-center"
+                >
+                  <SettingOutlined className="mr-2" />
+                  Settings
+                </Button>
+              </div>
+
+              <Button
+                type="primary"
+                onClick={downloadActivity}
+                loading={isDownloading}
+                disabled={!filters.repository || !filters.dateRange || !parsedRepo}
+                size="large"
+              >
+                <DownloadOutlined className="mr-2" />
+                Download Activity
+              </Button>
+            </div>
+
+            {/* Progress Bar */}
+            {isDownloading && (
+              <div className="mt-6 p-4 bg-green-50 border border-green-200 rounded-lg">
+                <div className="flex items-center mb-2">
+                  <div className="animate-spin rounded-full h-4 w-4 border-b-2 border-green-600 mr-2"></div>
+                  <Text className="text-green-700 font-medium">Downloading activity data...</Text>
+                </div>
+                <Progress percent={downloadProgress} status="active" strokeColor="#10b981" className="mb-2" />
+                <Text className="text-green-600 text-sm">{downloadProgress}% complete</Text>
+              </div>
+            )}
+          </Form>
+
+          {/* Data Structure Info */}
+          {/* <Divider />
+          <div className="bg-gradient-to-br from-indigo-50 to-purple-50 p-6 rounded-lg border border-indigo-200">
+            <div className="flex items-center mb-4">
+              <div className="w-8 h-8 bg-indigo-100 rounded-full flex items-center justify-center mr-3">
+                <span className="text-indigo-600 font-bold">i</span>
+              </div>
+              <Title level={4} className="text-indigo-800 mb-0">
+                Available Fields
+              </Title>
+            </div>
+            <Paragraph className="text-gray-700">
+              <Text strong className="text-indigo-800">
+                Select the fields you want in your download:
+              </Text>
+              <div className="grid grid-cols-1 md:grid-cols-2 gap-4 mt-4">
+                <div className="space-y-2">
+                  <div className="flex items-center">
+                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
+                    <span>
+                      <strong>Number</strong> - PR/Issue number or commit SHA
+                    </span>
+                  </div>
+                  <div className="flex items-center">
+                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
+                    <span>
+                      <strong>Title</strong> - Title of the PR/Issue or commit message
+                    </span>
+                  </div>
+                  <div className="flex items-center">
+                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
+                    <span>
+                      <strong>Type</strong> - pull_requests, issues, or commits
+                    </span>
+                  </div>
+                  <div className="flex items-center">
+                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
+                    <span>
+                      <strong>State</strong> - open, closed, or merged
+                    </span>
+                  </div>
+                  <div className="flex items-center">
+                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
+                    <span>
+                      <strong>Author</strong> - Username of the creator
+                    </span>
+                  </div>
+                </div>
+                <div className="space-y-2">
+                  <div className="flex items-center">
+                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
+                    <span>
+                      <strong>Created At</strong> - Creation timestamp
+                    </span>
+                  </div>
+                  <div className="flex items-center">
+                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
+                    <span>
+                      <strong>Merged At</strong> - Merge timestamp (for PRs)
+                    </span>
+                  </div>
+                  <div className="flex items-center">
+                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
+                    <span>
+                      <strong>Labels</strong> - Comma-separated list of labels
+                    </span>
+                  </div>
+                  <div className="flex items-center">
+                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
+                    <span>
+                      <strong>Assignees</strong> - Comma-separated list of assignees
+                    </span>
+                  </div>
+                  <div className="flex items-center">
+                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
+                    <span>
+                      <strong>URL</strong> - GitHub URL
+                    </span>
+                  </div>
+                </div>
+              </div>
+            </Paragraph>
+          </div> */}
+        </Card>
+      </div>
+    </>
+  );
+}

From 557eab16e22fda6370f89598ecc3302cbdc0e3ec Mon Sep 17 00:00:00 2001
From: abhimanyurajeesh <abhimanyurajeesh@gmail.com>
Date: Thu, 7 Aug 2025 15:41:51 +0530
Subject: [PATCH 08/10] Refactor GitHub activity report generation to utilize
 GitHub CLI for fetching pull requests, with a fallback to the GitHub API.
 Update the download page to include a JSON to CSV converter, allowing users
 to customize fields and download converted data. Enhance error handling and
 user notifications throughout the process.

---
 src/app/api/github-activity/route.ts | 198 ++++----
 src/app/download/page.tsx            | 709 +++++++++++----------------
 2 files changed, 389 insertions(+), 518 deletions(-)

diff --git a/src/app/api/github-activity/route.ts b/src/app/api/github-activity/route.ts
index c63ec8e..42ddb61 100644
--- a/src/app/api/github-activity/route.ts
+++ b/src/app/api/github-activity/route.ts
@@ -1,126 +1,148 @@
 import { NextRequest, NextResponse } from "next/server";
+import { exec } from "child_process";
+import { promisify } from "util";
+
+const execAsync = promisify(exec);
 
 export async function POST(request: NextRequest) {
   try {
     const body = await request.json();
-    const { owner, repo, activityTypes, startDate, endDate, state = "all", githubToken } = body;
+    const { owner, repo, startDate, endDate, state = "merged", githubToken } = body;
 
     if (!owner || !repo) {
       return NextResponse.json({ error: "Owner and repository are required" }, { status: 400 });
     }
 
-    const headers: { [key: string]: string } = {
-      Accept: "application/vnd.github.v3+json",
-    };
+    if (!startDate || !endDate) {
+      return NextResponse.json({ error: "Start date and end date are required" }, { status: 400 });
+    }
 
+    // Set GitHub token if provided
     if (githubToken) {
-      headers["Authorization"] = `token ${githubToken}`;
+      process.env.GITHUB_TOKEN = githubToken;
     }
 
-    const allData: any[] = [];
+    // Try GitHub CLI first, then fallback to GitHub API
+    let data = [];
+    let useFallback = false;
+
+    try {
+      // First, let's test if we can access the repository
+      console.log("Testing repository access...");
+      const testCommand = `gh repo view ${owner}/${repo} --json name,description`;
 
-    // Fetch different types of activity
-    for (const activityType of activityTypes) {
       try {
-        let url = "";
-        const params = new URLSearchParams();
-
-        switch (activityType) {
-          case "pull_requests":
-            url = `https://api.github.com/repos/${owner}/${repo}/pulls`;
-            // For PRs, we need to handle merged state differently
-            if (state === "merged") {
-              params.set("state", "closed");
-            } else {
-              params.set("state", state === "all" ? "all" : state);
-            }
-            params.set("per_page", "100");
-            break;
-
-          case "issues":
-            url = `https://api.github.com/repos/${owner}/${repo}/issues`;
-            params.set("state", state === "all" ? "all" : state);
-            params.set("per_page", "100");
-            break;
-
-          case "commits":
-            url = `https://api.github.com/repos/${owner}/${repo}/commits`;
-            params.set("since", startDate);
-            params.set("until", endDate);
-            params.set("per_page", "100");
-            break;
-
-          case "releases":
-            url = `https://api.github.com/repos/${owner}/${repo}/releases`;
-            params.set("per_page", "100");
-            break;
-
-          case "discussions":
-            url = `https://api.github.com/repos/${owner}/${repo}/discussions`;
-            params.set("per_page", "100");
-            break;
-
-          default:
-            continue;
-        }
+        await execAsync(testCommand);
+        console.log("Repository access successful");
+      } catch (testError: any) {
+        console.error("Repository access failed:", testError.message);
+        useFallback = true;
+      }
+
+      if (!useFallback) {
+        // Construct the GitHub CLI command - simplified version
+        const command = `gh pr list --repo ${owner}/${repo} --state ${state} --json number,title,state,author,createdAt,mergedAt,labels,assignees,url --limit 100`;
+
+        console.log("Executing command:", command);
 
-        const response = await fetch(`${url}?${params.toString()}`, { headers });
+        // Add timeout to prevent hanging
+        const { stdout, stderr } = (await Promise.race([
+          execAsync(command),
+          new Promise((_, reject) => setTimeout(() => reject(new Error("Command timeout after 30 seconds")), 30000)),
+        ])) as { stdout: string; stderr: string };
 
-        if (!response.ok) {
-          if (activityType === "discussions" && response.status === 404) {
-            // Discussions might not be enabled for this repository
-            continue;
+        console.log("Command stdout length:", stdout.length);
+        console.log("Command stderr:", stderr);
+
+        if (stderr && !stderr.includes("warning")) {
+          console.warn("GitHub CLI stderr:", stderr);
+        }
+
+        if (stdout.trim()) {
+          try {
+            data = JSON.parse(stdout);
+            console.log("Successfully parsed JSON, found", data.length, "pull requests");
+          } catch (parseError) {
+            console.error("Failed to parse JSON output:", parseError);
+            console.log("Raw stdout (first 500 chars):", stdout.substring(0, 500));
+            useFallback = true;
           }
-          throw new Error(`GitHub API Error: ${response.status} ${response.statusText}`);
+        } else {
+          console.log("No stdout received from command");
+          useFallback = true;
         }
+      }
+    } catch (execError: any) {
+      console.error("GitHub CLI execution error:", execError);
+      useFallback = true;
+    }
 
-        const data = await response.json();
+    // Fallback to GitHub API if CLI failed
+    if (useFallback || data.length === 0) {
+      console.log("Using GitHub API fallback...");
 
-        // Add type identifier to each item
-        const typedData = data.map((item: any) => ({
-          ...item,
-          type: activityType,
-        }));
+      const headers: { [key: string]: string } = {
+        Accept: "application/vnd.github.v3+json",
+      };
 
-        allData.push(...typedData);
-      } catch (error: any) {
-        console.error(`Error fetching ${activityType}:`, error);
-        // Continue with other activity types even if one fails
+      if (githubToken) {
+        headers["Authorization"] = `token ${githubToken}`;
       }
-    }
 
-    // Apply date range filter
-    let filteredData = allData;
+      const url = `https://api.github.com/repos/${owner}/${repo}/pulls`;
+      const params = new URLSearchParams();
+      params.set("state", state === "merged" ? "closed" : state);
+      params.set("per_page", "100");
 
-    if (startDate && endDate) {
-      filteredData = filteredData.filter((item: any) => {
-        const itemDate = item.created_at || item.commit?.author?.date;
-        if (!itemDate) return false;
+      const response = await fetch(`${url}?${params.toString()}`, { headers });
 
-        const date = new Date(itemDate);
-        const start = new Date(startDate);
-        const end = new Date(endDate);
+      if (!response.ok) {
+        throw new Error(`GitHub API Error: ${response.status} ${response.statusText}`);
+      }
 
-        return date >= start && date <= end;
-      });
+      const apiData = await response.json();
+
+      // Filter for merged PRs if state is "merged"
+      if (state === "merged") {
+        data = apiData.filter((item: any) => item.merged_at != null);
+      } else {
+        data = apiData;
+      }
+
+      console.log("GitHub API fallback found", data.length, "pull requests");
     }
 
-    // Filter for merged PRs if state is "merged"
-    if (state === "merged") {
-      filteredData = filteredData.filter((item: any) => {
-        // For pull requests, check if they have a merged_at date
-        if (item.type === "pull_requests") {
-          return item.merged_at != null;
-        }
-        // For issues, merged state doesn't apply
-        return false;
+    // Filter by date range if needed
+    let filteredData = data;
+    if (startDate && endDate) {
+      filteredData = data.filter((item: any) => {
+        if (!item.mergedAt && !item.merged_at) return false;
+        const mergedDate = new Date(item.mergedAt || item.merged_at);
+        const start = new Date(startDate);
+        const end = new Date(endDate);
+        return mergedDate >= start && mergedDate <= end;
       });
+      console.log("Filtered to", filteredData.length, "PRs in date range");
     }
 
+    // Transform the data to match the expected format
+    const transformedData = filteredData.map((item: any) => ({
+      number: item.number,
+      title: item.title,
+      type: "pull_requests",
+      state: item.state,
+      author: item.author?.login || item.user?.login || "",
+      created_at: item.createdAt || item.created_at,
+      merged_at: item.mergedAt || item.merged_at,
+      labels: item.labels?.map((l: any) => l.name).join(", ") || "",
+      assignees: item.assignees?.map((a: any) => a.login).join(", ") || "",
+      html_url: item.url || item.html_url,
+    }));
+
     return NextResponse.json({
       success: true,
-      data: filteredData,
-      total: filteredData.length,
+      data: transformedData,
+      total: transformedData.length,
       repository: `${owner}/${repo}`,
     });
   } catch (error: any) {
diff --git a/src/app/download/page.tsx b/src/app/download/page.tsx
index 603e73c..ec18d35 100644
--- a/src/app/download/page.tsx
+++ b/src/app/download/page.tsx
@@ -1,43 +1,17 @@
 "use client";
 
-import React, { useEffect, useState } from "react";
-import {
-  Button,
-  Card,
-  Checkbox,
-  DatePicker,
-  Divider,
-  Input,
-  Select,
-  Space,
-  notification,
-  Typography,
-  Modal,
-  Form,
-  Radio,
-  Switch,
-  Progress,
-} from "antd";
-import Icon, { DownloadOutlined, SettingOutlined, CheckCircleTwoTone, CloseCircleTwoTone } from "@ant-design/icons";
-import dayjs from "dayjs";
-import type { Dayjs } from "dayjs";
+import React, { useState } from "react";
+import { Button, Card, Input, notification, Typography, Form, Radio, Alert, Checkbox, DatePicker } from "antd";
+import { DownloadOutlined, CopyOutlined } from "@ant-design/icons";
 import Title from "antd/es/typography/Title";
 import Paragraph from "antd/es/typography/Paragraph";
 import { useRouter } from "next/navigation";
+import type { Dayjs } from "dayjs";
 
 const { Text } = Typography;
+const { TextArea } = Input;
 const { RangePicker } = DatePicker;
 
-const rangePresets: {
-  label: string;
-  value: [Dayjs, Dayjs];
-}[] = [
-  { label: "Last 1 Day", value: [dayjs().add(-1, "d"), dayjs()] },
-  { label: "Last 7 Days", value: [dayjs().add(-7, "d"), dayjs()] },
-  { label: "Last 14 Days", value: [dayjs().add(-30, "d"), dayjs()] },
-  { label: "Last 90 Days", value: [dayjs().add(-90, "d"), dayjs()] },
-];
-
 type NotificationType = "success" | "info" | "warning" | "error";
 
 const globalStyles = `
@@ -59,95 +33,75 @@ const globalStyles = `
   }
 `;
 
-interface ActivityFilters {
+interface ConverterState {
+  jsonInput: string;
+  csvOutput: string;
+  selectedFields: string[];
+  isConverting: boolean;
+}
+
+interface CommandGenerator {
   repository: string;
+  state: "merged" | "open" | "closed";
   dateRange: [Dayjs, Dayjs] | null;
-  activityTypes: string[];
-  state: "all" | "open" | "closed" | "merged";
-  format: "csv" | "json";
-  selectedFields: string[];
+  selectedCommandFields: string[];
+  generatedCommand: string;
 }
 
+const fieldOptions = [
+  { label: "Number", value: "number" },
+  { label: "Title", value: "title" },
+  { label: "State", value: "state" },
+  { label: "Author", value: "author" },
+  { label: "Created At", value: "createdAt" },
+  { label: "Merged At", value: "mergedAt" },
+  { label: "Labels", value: "labels" },
+  { label: "Assignees", value: "assignees" },
+  { label: "URL", value: "url" },
+];
+
 export default function DownloadPage() {
   const [api, contextHolder] = notification.useNotification();
   const router = useRouter();
 
-  const notify = (type: NotificationType, message: string, description: string) => {
-    api[type]({
-      message,
-      description,
-      duration: 3,
-      className: "notification-compact",
-      style: {
-        width: "auto",
-        minWidth: "250px",
-        maxWidth: "90vw",
-      },
-    });
-  };
-
-  const [githubTokenInput, setGithubTokenInput] = useState("");
-  const [settings, setSettings] = useState({
-    fetchGithubToken: "",
+  const [converter, setConverter] = useState<ConverterState>({
+    jsonInput: "",
+    csvOutput: "",
+    selectedFields: [],
+    isConverting: false,
   });
 
-  const [filters, setFilters] = useState<ActivityFilters>({
+  const [commandGenerator, setCommandGenerator] = useState<CommandGenerator>({
     repository: "",
+    state: "merged",
     dateRange: null,
-    activityTypes: ["pull_requests", "issues"],
-    state: "all",
-    format: "csv",
-    selectedFields: [
+    selectedCommandFields: [
       "number",
       "title",
-      "type",
       "state",
       "author",
-      "created_at",
-      "merged_at",
+      "createdAt",
+      "mergedAt",
       "labels",
       "assignees",
-      "html_url",
+      "url",
     ],
+    generatedCommand: "",
   });
 
-  const [downloadProgress, setDownloadProgress] = useState(0);
-  const [isDownloading, setIsDownloading] = useState(false);
-  const [parsedRepo, setParsedRepo] = useState<{ owner: string; repo: string } | null>(null);
-
-  const activityTypeOptions = [
-    { label: "Pull Requests", value: "pull_requests" },
-    { label: "Issues", value: "issues" },
-  ];
-
-  const formatOptions = [
-    { label: "CSV", value: "csv" },
-    { label: "JSON", value: "json" },
-  ];
-
-  const fieldOptions = [
-    { label: "Number", value: "number" },
-    { label: "Title", value: "title" },
-    { label: "Type", value: "type" },
-    { label: "State", value: "state" },
-    { label: "Author", value: "author" },
-    { label: "Created At", value: "created_at" },
-    { label: "Merged At", value: "merged_at" },
-    { label: "Labels", value: "labels" },
-    { label: "Assignees", value: "assignees" },
-    { label: "URL", value: "html_url" },
-  ];
-
-  useEffect(() => {
-    const githubToken = localStorage.getItem("githubToken");
-    if (githubToken) {
-      setGithubTokenInput(githubToken);
-      setSettings({
-        ...settings,
-        fetchGithubToken: githubToken,
-      });
-    }
-  }, []);
+  const notify = (type: NotificationType, message: string, description: string) => {
+    api[type]({
+      message,
+      description,
+      duration: 3,
+      className: "notification-compact",
+      style: {
+        width: "auto",
+        minWidth: "250px",
+        maxWidth: "90vw",
+      },
+    });
+  };
 
   const parseRepositoryUrl = (url: string) => {
     const patterns = [/github\.com\/([^/]+)\/([^/?]+)/, /^([^/]+)\/([^/]+)$/];
@@ -164,158 +118,139 @@ export default function DownloadPage() {
     return null;
   };
 
-  const handleRepositoryChange = (value: string) => {
-    setFilters({ ...filters, repository: value });
-    const parsed = parseRepositoryUrl(value);
-    setParsedRepo(parsed);
-  };
+  const generateCommand = () => {
+    if (!commandGenerator.repository) {
+      notify("error", "Repository Required", "Please enter a repository");
+      return;
+    }
 
-  const saveFetchSettings = () => {
-    const token = githubTokenInput.trim();
-    if (!token) {
-      notify("error", "Invalid Token", "Please enter a valid GitHub token");
+    const parsed = parseRepositoryUrl(commandGenerator.repository);
+    if (!parsed) {
+      notify("error", "Invalid Repository", "Please enter a valid repository URL or owner/repo format");
       return;
     }
 
-    setSettings({
-      ...settings,
-      fetchGithubToken: token,
-    });
-    localStorage.setItem("githubToken", token);
-    notify("success", "Settings Saved", "GitHub token has been saved");
-  };
+    let command = `gh pr list --repo ${parsed.owner}/${parsed.repo} --state ${commandGenerator.state}`;
 
-  const downloadActivity = async () => {
-    if (!filters.repository) {
-      notify("error", "Repository Required", "Please enter a repository URL or owner/repo");
-      return;
+    // Add JSON fields
+    const jsonFields = commandGenerator.selectedCommandFields.join(",");
+    command += ` --json "${jsonFields}"`;
+
+    // Add date range if selected
+    if (commandGenerator.dateRange) {
+      const startDate = commandGenerator.dateRange[0].format("YYYY-MM-DD");
+      const endDate = commandGenerator.dateRange[1].format("YYYY-MM-DD");
+      command += ` --search "is:pr merged:${startDate}..${endDate}"`;
     }
 
-    if (!filters.dateRange) {
-      notify("error", "Date Range Required", "Please select a date range");
-      return;
+    command += ` --limit 300`;
+
+    setCommandGenerator((prev) => ({ ...prev, generatedCommand: command }));
+  };
+
+  const copyCommand = () => {
+    if (commandGenerator.generatedCommand) {
+      navigator.clipboard.writeText(commandGenerator.generatedCommand);
+      notify("success", "Command Copied", "GitHub CLI command copied to clipboard");
     }
+  };
 
-    if (!parsedRepo) {
-      notify("error", "Invalid Repository", "Please enter a valid repository URL or owner/repo format");
+  const convertJsonToCsv = (jsonData: any[], selectedFields: string[]) => {
+    if (jsonData.length === 0) return "";
+
+    // Always include slno as first column, then selected fields
+    const headers = ["slno", ...selectedFields];
+    const csvRows = [headers.join(",")];
+
+    jsonData.forEach((item, index) => {
+      const row = headers.map((header) => {
+        let value = "";
+        if (header === "slno") {
+          value = (index + 1).toString();
+        } else {
+          value = item[header];
+          if (value === null || value === undefined) value = "";
+          if (Array.isArray(value)) value = value.join(", ");
+          if (typeof value === "object") value = JSON.stringify(value);
+        }
+        return `"${String(value).replace(/"/g, '""')}"`;
+      });
+      csvRows.push(row.join(","));
+    });
+
+    return csvRows.join("\n");
+  };
+
+  const handleConvert = () => {
+    if (!converter.jsonInput.trim()) {
+      notify("error", "Input Required", "Please paste your JSON data");
       return;
     }
 
-    setIsDownloading(true);
-    setDownloadProgress(0);
+    setConverter({ ...converter, isConverting: true });
 
     try {
-      const { owner, repo } = parsedRepo;
-      const startDate = filters.dateRange[0].format("YYYY-MM-DD");
-      const endDate = filters.dateRange[1].format("YYYY-MM-DD");
-
-      setDownloadProgress(25);
-
-      // Use the new API endpoint
-      const response = await fetch("/api/github-activity", {
-        method: "POST",
-        headers: {
-          "Content-Type": "application/json",
-        },
-        body: JSON.stringify({
-          owner,
-          repo,
-          activityTypes: filters.activityTypes,
-          startDate,
-          endDate,
-          state: filters.state,
-          githubToken: settings.fetchGithubToken,
-        }),
-      });
-
-      setDownloadProgress(75);
+      const jsonData = JSON.parse(converter.jsonInput);
 
-      if (!response.ok) {
-        const errorData = await response.json();
-        throw new Error(errorData.error || "Failed to fetch activity data");
+      if (!Array.isArray(jsonData)) {
+        notify("error", "Invalid JSON", "Please provide a JSON array");
+        setConverter({ ...converter, isConverting: false });
+        return;
       }
 
-      const result = await response.json();
-      const allData = result.data;
-
-      // Flatten the data structure with all possible fields
-      const allFieldsData = allData.map((item: any, index: number) => ({
-        slno: (index + 1).toString(),
-        number: item.number || item.sha?.slice(0, 7) || "",
-        title: item.title || item.commit?.message?.split("\n")[0] || "",
-        type: item.type,
-        state: item.state || item.merged_at ? "merged" : "open",
-        author: item.user?.login || item.author?.login || item.commit?.author?.name || "",
-        created_at: item.created_at || item.commit?.author?.date || "",
-        merged_at: item.merged_at || "",
-        labels: item.labels?.map((l: any) => l.name).join(", ") || "",
-        assignees: item.assignees?.map((a: any) => a.login).join(", ") || "",
-        html_url: item.html_url || "",
-      }));
+      // Auto-detect fields from the first item
+      const firstItem = jsonData[0] || {};
+      const availableFields = Object.keys(firstItem).filter((key) =>
+        fieldOptions.some((option) => option.value === key)
+      );
 
-      // Filter data to only include selected fields, but always include slno
-      const flatData = allFieldsData.map((item: any) => {
-        const filteredItem: any = { slno: item.slno }; // Always include serial number
-        filters.selectedFields.forEach((field) => {
-          filteredItem[field] = item[field];
-        });
-        return filteredItem;
-      });
+      // Set default selected fields if none are selected
+      const selectedFields = converter.selectedFields.length > 0 ? converter.selectedFields : availableFields;
 
-      setDownloadProgress(100);
-
-      // Generate download file
-      let downloadContent = "";
-      let filename = `${owner}-${repo}-activity-${startDate}-to-${endDate}`;
-
-      switch (filters.format) {
-        case "csv":
-          downloadContent = generateCSV(flatData);
-          filename += ".csv";
-          break;
-        case "json":
-          downloadContent = JSON.stringify(flatData, null, 2);
-          filename += ".json";
-          break;
-      }
+      setConverter((prev) => ({ ...prev, selectedFields }));
 
-      // Create and download file
-      const blob = new Blob([downloadContent], { type: "text/plain" });
-      const url = window.URL.createObjectURL(blob);
-      const a = document.createElement("a");
-      a.href = url;
-      a.download = filename;
-      document.body.appendChild(a);
-      a.click();
-      window.URL.revokeObjectURL(url);
-      document.body.removeChild(a);
-
-      notify("success", "Download Complete", `Downloaded ${flatData.length} items from ${owner}/${repo}`);
+      const output = convertJsonToCsv(jsonData, selectedFields);
+
+      setConverter((prev) => ({
+        ...prev,
+        csvOutput: output,
+        isConverting: false,
+      }));
+
+      notify("success", "Conversion Complete", `Converted ${jsonData.length} items`);
     } catch (error: any) {
-      notify("error", "Download Failed", error.message);
-    } finally {
-      setIsDownloading(false);
-      setDownloadProgress(0);
+      notify("error", "Conversion Failed", error.message);
+      setConverter((prev) => ({ ...prev, isConverting: false }));
     }
   };
 
-  const generateCSV = (data: any[]) => {
-    if (data.length === 0) return "";
+  const handleDownload = () => {
+    if (!converter.csvOutput) {
+      notify("error", "No Output", "Please convert data first");
+      return;
+    }
 
-    // Always include slno as first column, then selected fields
-    const headers = ["slno", ...filters.selectedFields];
-    const csvRows = [headers.join(",")];
+    const filename = `converted-data.csv`;
+    const blob = new Blob([converter.csvOutput], { type: "text/plain" });
+    const url = window.URL.createObjectURL(blob);
+    const a = document.createElement("a");
+    a.href = url;
+    a.download = filename;
+    document.body.appendChild(a);
+    a.click();
+    window.URL.revokeObjectURL(url);
+    document.body.removeChild(a);
+
+    notify("success", "Download Complete", `Downloaded ${filename}`);
+  };
 
-    data.forEach((item) => {
-      const row = headers.map((header) => {
-        const value = item[header];
-        if (value === null || value === undefined) return "";
-        return `"${String(value).replace(/"/g, '""')}"`;
-      });
-      csvRows.push(row.join(","));
+  const handleClear = () => {
+    setConverter({
+      jsonInput: "",
+      csvOutput: "",
+      selectedFields: [],
+      isConverting: false,
     });
-
-    return csvRows.join("\n");
   };
 
   return (
@@ -325,264 +260,178 @@ export default function DownloadPage() {
       </style>
       {contextHolder}
       <div className="py-8 px-4">
-        <Card className="mx-auto max-w-5xl shadow-lg border-0">
+        <Card className="mx-auto max-w-6xl shadow-lg border-0">
           <div className="flex justify-between items-center mb-8">
             <div>
               <Title level={4} className="mb-2 text-gray-800">
                 <DownloadOutlined className="mr-3 text-blue-500" />
-                GitHub Activity Downloader
+                JSON to CSV Converter
               </Title>
-              <Paragraph className="text-sm text-gray-600">
-                Download repository activity with customizable data structure
-              </Paragraph>
+              <Paragraph className="text-sm text-gray-600">Convert GitHub CLI JSON output to CSV format</Paragraph>
             </div>
             <Button type="default" onClick={() => router.push("/")} className="flex items-center">
               ← Back to Activity Report
             </Button>
           </div>
 
-          <Form layout="vertical" className="space-y-6">
-            <div className="grid grid-cols-1 lg:grid-cols-2 gap-4">
+          <Alert
+            message="How to use"
+            description="1. Generate the GitHub CLI command below. 2. Run it in your terminal. 3. Copy the JSON output and paste it in the converter. 4. Select the fields you want to include. 5. Convert and download."
+            type="info"
+            showIcon
+            className="mb-6"
+          />
+
+          {/* Command Generator Section */}
+          <div className="bg-gray-50 p-6 rounded-lg border border-green-200 mb-6">
+            <Title level={5} className="text-green-800 mb-4">
+              🔧 Generate GitHub CLI Command
+            </Title>
+
+            <div>
               {/* Repository Input */}
-              <div className="bg-gray-50 p-6 rounded-lg">
+              <div>
                 <Form.Item label={<span className="text-gray-700 font-medium">Repository</span>} required>
                   <Input
-                    placeholder="Enter repository URL or owner/repo (e.g., ohcnetwork/care_fe)"
-                    value={filters.repository}
-                    onChange={(e) => handleRepositoryChange(e.target.value)}
-                    status={filters.repository && !parsedRepo ? "error" : undefined}
-                    suffix={
-                      filters.repository && parsedRepo ? (
-                        <CheckCircleTwoTone twoToneColor="#52c41a" />
-                      ) : filters.repository && !parsedRepo ? (
-                        <CloseCircleTwoTone twoToneColor="#ff4d4f" />
-                      ) : (
-                        <span />
-                      )
+                    placeholder="owner/repo or URL"
+                    value={commandGenerator.repository}
+                    onChange={(e) => setCommandGenerator({ ...commandGenerator, repository: e.target.value })}
+                    status={
+                      commandGenerator.repository && !parseRepositoryUrl(commandGenerator.repository)
+                        ? "error"
+                        : undefined
                     }
                   />
-                  {parsedRepo && (
-                    <div className="mt-2 p-2 bg-green-50 border border-green-200 rounded">
-                      <Text className="text-green-700 text-sm">
-                        ✓ Repository: {parsedRepo.owner}/{parsedRepo.repo}
-                      </Text>
-                    </div>
-                  )}
                 </Form.Item>
               </div>
 
-              {/* Date Range */}
-              <div className="bg-gray-50 p-6 rounded-lg">
-                <Form.Item label={<span className="text-gray-700 font-medium">Date Range</span>} required>
-                  <RangePicker
-                    presets={rangePresets}
-                    showTime
-                    format="DD/MM/YYYY HH:mm"
-                    value={filters.dateRange}
-                    onChange={(dates) => setFilters({ ...filters, dateRange: dates as [Dayjs, Dayjs] | null })}
-                    className="w-full"
-                  />
-                </Form.Item>
-              </div>
-
-              {/* Activity Types */}
-              <div className="bg-gray-50 p-6 rounded-lg">
-                <Form.Item label={<span className="text-gray-700 font-medium">Activity Types</span>}>
-                  <Checkbox.Group
-                    options={activityTypeOptions}
-                    value={filters.activityTypes}
-                    onChange={(values) => setFilters({ ...filters, activityTypes: values as string[] })}
-                  />
-                </Form.Item>
-              </div>
-
-              {/* State Filter */}
-              <div className="bg-gray-50 p-6 rounded-lg">
+              {/* State Selection */}
+              <div>
                 <Form.Item label={<span className="text-gray-700 font-medium">State</span>}>
                   <Radio.Group
-                    value={filters.state}
-                    onChange={(e) => setFilters({ ...filters, state: e.target.value })}
+                    value={commandGenerator.state}
+                    onChange={(e) => setCommandGenerator({ ...commandGenerator, state: e.target.value })}
                   >
-                    <Radio value="all">All</Radio>
+                    <Radio value="merged">Merged</Radio>
                     <Radio value="open">Open</Radio>
                     <Radio value="closed">Closed</Radio>
-                    <Radio value="merged">Merged</Radio>
                   </Radio.Group>
                 </Form.Item>
               </div>
 
-              {/* Download Format */}
-              <div className="bg-gray-50 p-6 rounded-lg">
-                <Form.Item label={<span className="text-gray-700 font-medium">Download Format</span>}>
-                  <Radio.Group
-                    value={filters.format}
-                    onChange={(e) => setFilters({ ...filters, format: e.target.value })}
-                    className="space-y-2"
-                  >
-                    {formatOptions.map((option) => (
-                      <Radio key={option.value} value={option.value}>
-                        {option.label}
-                      </Radio>
-                    ))}
-                  </Radio.Group>
+              {/* Date Range */}
+              <div>
+                <Form.Item label={<span className="text-gray-700 font-medium">Date Range (Optional)</span>}>
+                  <RangePicker
+                    value={commandGenerator.dateRange}
+                    onChange={(dates) =>
+                      setCommandGenerator({ ...commandGenerator, dateRange: dates as [Dayjs, Dayjs] | null })
+                    }
+                    className="w-full"
+                  />
                 </Form.Item>
               </div>
             </div>
 
-            {/* Field Selection */}
-            <div className="bg-blue-50 p-6 rounded-lg border border-blue-200">
-              <Form.Item label={<span className="text-blue-800 font-medium">Select Fields to Include</span>}>
-                <div className="bg-white p-4 rounded border">
+            {/* Command Fields Selection */}
+            <div className="mt-4">
+              <Form.Item>
+                <Title level={5} className="text-sm mb-4">
+                  JSON Fields to Include
+                </Title>
+                <div>
                   <Checkbox.Group
                     options={fieldOptions}
-                    value={filters.selectedFields}
-                    onChange={(values) => setFilters({ ...filters, selectedFields: values as string[] })}
+                    value={commandGenerator.selectedCommandFields}
+                    onChange={(values: any) =>
+                      setCommandGenerator({ ...commandGenerator, selectedCommandFields: values as string[] })
+                    }
                     className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-5 gap-3"
                   />
                 </div>
               </Form.Item>
             </div>
+            {/* Generate Button */}
 
-            {/* Settings and Download Buttons */}
-            <div className="flex justify-between items-center mt-8 p-6 bg-gradient-to-r from-blue-50 to-indigo-50 rounded-lg border">
-              <div>
+            <Button type="primary" onClick={generateCommand} disabled={!commandGenerator.repository} className="w-full">
+              Generate Command
+            </Button>
+          </div>
+
+          {/* Generated Command */}
+          {commandGenerator.generatedCommand && (
+            <div className="bg-white p-4 rounded border">
+              <div className="flex justify-between items-center mb-2">
+                <Text strong className="text-gray-700">
+                  Generated Command:
+                </Text>
+                <Button type="text" icon={<CopyOutlined />} onClick={copyCommand} size="small">
+                  Copy
+                </Button>
+              </div>
+              <TextArea value={commandGenerator.generatedCommand} readOnly rows={2} className="font-mono text-sm" />
+            </div>
+          )}
+
+          <div className="grid grid-cols-1 lg:grid-cols-2 gap-6">
+            {/* Input Section */}
+            <div className="space-y-4">
+              <div className="bg-gray-50 p-6 rounded-lg">
+                <Form.Item label={<span className="text-gray-700 font-medium">JSON Input</span>} required>
+                  <TextArea
+                    rows={15}
+                    placeholder="Paste your JSON data here..."
+                    value={converter.jsonInput}
+                    onChange={(e) => setConverter({ ...converter, jsonInput: e.target.value })}
+                    className="font-mono text-sm"
+                  />
+                </Form.Item>
+              </div>
+
+              {/* Action Buttons */}
+              <div className="flex space-x-4">
                 <Button
-                  onClick={() => {
-                    const modal = Modal.info({
-                      title: "GitHub Settings",
-                      content: (
-                        <div>
-                          <Text>GitHub Access Token</Text>
-                          <Input
-                            placeholder="ghp_**********"
-                            className="mt-2"
-                            value={githubTokenInput}
-                            onChange={(e) => setGithubTokenInput(e.target.value)}
-                          />
-                          <Paragraph className="text-xs text-gray-500 mt-2">
-                            Add a GitHub token to access private repositories and increase API rate limits
-                          </Paragraph>
-                        </div>
-                      ),
-                      onOk: saveFetchSettings,
-                    });
-                  }}
+                  type="primary"
+                  onClick={handleConvert}
+                  loading={converter.isConverting}
+                  disabled={!converter.jsonInput.trim()}
                   size="large"
-                  className="flex items-center"
+                  className="flex-1"
                 >
-                  <SettingOutlined className="mr-2" />
-                  Settings
+                  Convert
+                </Button>
+                <Button onClick={handleClear} size="large" className="flex-1">
+                  Clear
                 </Button>
               </div>
+            </div>
+
+            {/* Output Section */}
+            <div className="space-y-4">
+              <div className="bg-gray-50 p-6 rounded-lg">
+                <Form.Item label={<span className="text-gray-700 font-medium">Output</span>}>
+                  <TextArea
+                    rows={15}
+                    value={converter.csvOutput}
+                    readOnly
+                    placeholder="Converted output will appear here..."
+                    className="font-mono text-sm"
+                  />
+                </Form.Item>
+              </div>
 
               <Button
                 type="primary"
-                onClick={downloadActivity}
-                loading={isDownloading}
-                disabled={!filters.repository || !filters.dateRange || !parsedRepo}
+                onClick={handleDownload}
+                disabled={!converter.csvOutput}
                 size="large"
+                className="w-full"
+                icon={<DownloadOutlined />}
               >
-                <DownloadOutlined className="mr-2" />
-                Download Activity
+                Download CSV
               </Button>
             </div>
-
-            {/* Progress Bar */}
-            {isDownloading && (
-              <div className="mt-6 p-4 bg-green-50 border border-green-200 rounded-lg">
-                <div className="flex items-center mb-2">
-                  <div className="animate-spin rounded-full h-4 w-4 border-b-2 border-green-600 mr-2"></div>
-                  <Text className="text-green-700 font-medium">Downloading activity data...</Text>
-                </div>
-                <Progress percent={downloadProgress} status="active" strokeColor="#10b981" className="mb-2" />
-                <Text className="text-green-600 text-sm">{downloadProgress}% complete</Text>
-              </div>
-            )}
-          </Form>
-
-          {/* Data Structure Info */}
-          {/* <Divider />
-          <div className="bg-gradient-to-br from-indigo-50 to-purple-50 p-6 rounded-lg border border-indigo-200">
-            <div className="flex items-center mb-4">
-              <div className="w-8 h-8 bg-indigo-100 rounded-full flex items-center justify-center mr-3">
-                <span className="text-indigo-600 font-bold">i</span>
-              </div>
-              <Title level={4} className="text-indigo-800 mb-0">
-                Available Fields
-              </Title>
-            </div>
-            <Paragraph className="text-gray-700">
-              <Text strong className="text-indigo-800">
-                Select the fields you want in your download:
-              </Text>
-              <div className="grid grid-cols-1 md:grid-cols-2 gap-4 mt-4">
-                <div className="space-y-2">
-                  <div className="flex items-center">
-                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
-                    <span>
-                      <strong>Number</strong> - PR/Issue number or commit SHA
-                    </span>
-                  </div>
-                  <div className="flex items-center">
-                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
-                    <span>
-                      <strong>Title</strong> - Title of the PR/Issue or commit message
-                    </span>
-                  </div>
-                  <div className="flex items-center">
-                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
-                    <span>
-                      <strong>Type</strong> - pull_requests, issues, or commits
-                    </span>
-                  </div>
-                  <div className="flex items-center">
-                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
-                    <span>
-                      <strong>State</strong> - open, closed, or merged
-                    </span>
-                  </div>
-                  <div className="flex items-center">
-                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
-                    <span>
-                      <strong>Author</strong> - Username of the creator
-                    </span>
-                  </div>
-                </div>
-                <div className="space-y-2">
-                  <div className="flex items-center">
-                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
-                    <span>
-                      <strong>Created At</strong> - Creation timestamp
-                    </span>
-                  </div>
-                  <div className="flex items-center">
-                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
-                    <span>
-                      <strong>Merged At</strong> - Merge timestamp (for PRs)
-                    </span>
-                  </div>
-                  <div className="flex items-center">
-                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
-                    <span>
-                      <strong>Labels</strong> - Comma-separated list of labels
-                    </span>
-                  </div>
-                  <div className="flex items-center">
-                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
-                    <span>
-                      <strong>Assignees</strong> - Comma-separated list of assignees
-                    </span>
-                  </div>
-                  <div className="flex items-center">
-                    <div className="w-2 h-2 bg-indigo-400 rounded-full mr-2"></div>
-                    <span>
-                      <strong>URL</strong> - GitHub URL
-                    </span>
-                  </div>
-                </div>
-              </div>
-            </Paragraph>
-          </div> */}
+          </div>
         </Card>
       </div>
     </>

From 01c033056b3747023dda02244b36ec5bdf48db9f Mon Sep 17 00:00:00 2001
From: abhimanyurajeesh <abhimanyurajeesh@gmail.com>
Date: Thu, 7 Aug 2025 15:47:29 +0530
Subject: [PATCH 09/10] Refactor field management in DownloadPage component to
 unify selected fields handling. Replace 'selectedCommandFields' with
 'selectedFields' for consistency across the converter and command generator,
 improving code clarity and maintainability.

---
 src/app/download/page.tsx | 30 ++++++++----------------------
 1 file changed, 8 insertions(+), 22 deletions(-)

diff --git a/src/app/download/page.tsx b/src/app/download/page.tsx
index ec18d35..e0873d0 100644
--- a/src/app/download/page.tsx
+++ b/src/app/download/page.tsx
@@ -36,7 +36,6 @@ const globalStyles = `
 interface ConverterState {
   jsonInput: string;
   csvOutput: string;
-  selectedFields: string[];
   isConverting: boolean;
 }
 
@@ -44,7 +43,7 @@ interface CommandGenerator {
   repository: string;
   state: "merged" | "open" | "closed";
   dateRange: [Dayjs, Dayjs] | null;
-  selectedCommandFields: string[];
+  selectedFields: string[];
   generatedCommand: string;
 }
 
@@ -67,7 +66,6 @@ export default function DownloadPage() {
   const [converter, setConverter] = useState<ConverterState>({
     jsonInput: "",
     csvOutput: "",
-    selectedFields: [],
     isConverting: false,
   });
 
@@ -75,17 +73,7 @@ export default function DownloadPage() {
     repository: "",
     state: "merged",
     dateRange: null,
-    selectedCommandFields: [
-      "number",
-      "title",
-      "state",
-      "author",
-      "createdAt",
-      "mergedAt",
-      "labels",
-      "assignees",
-      "url",
-    ],
+    selectedFields: ["number", "title", "state", "author", "createdAt", "mergedAt", "labels", "assignees", "url"],
     generatedCommand: "",
   });
 
@@ -133,7 +121,7 @@ export default function DownloadPage() {
     let command = `gh pr list --repo ${parsed.owner}/${parsed.repo} --state ${commandGenerator.state}`;
 
     // Add JSON fields
-    const jsonFields = commandGenerator.selectedCommandFields.join(",");
+    const jsonFields = commandGenerator.selectedFields.join(",");
     command += ` --json "${jsonFields}"`;
 
     // Add date range if selected
@@ -204,10 +192,9 @@ export default function DownloadPage() {
         fieldOptions.some((option) => option.value === key)
       );
 
-      // Set default selected fields if none are selected
-      const selectedFields = converter.selectedFields.length > 0 ? converter.selectedFields : availableFields;
-
-      setConverter((prev) => ({ ...prev, selectedFields }));
+      // Use the same fields selected in the command generator
+      const selectedFields =
+        commandGenerator.selectedFields.length > 0 ? commandGenerator.selectedFields : availableFields;
 
       const output = convertJsonToCsv(jsonData, selectedFields);
 
@@ -248,7 +235,6 @@ export default function DownloadPage() {
     setConverter({
       jsonInput: "",
       csvOutput: "",
-      selectedFields: [],
       isConverting: false,
     });
   };
@@ -342,9 +328,9 @@ export default function DownloadPage() {
                 <div>
                   <Checkbox.Group
                     options={fieldOptions}
-                    value={commandGenerator.selectedCommandFields}
+                    value={commandGenerator.selectedFields}
                     onChange={(values: any) =>
-                      setCommandGenerator({ ...commandGenerator, selectedCommandFields: values as string[] })
+                      setCommandGenerator({ ...commandGenerator, selectedFields: values as string[] })
                     }
                     className="grid grid-cols-2 md:grid-cols-3 lg:grid-cols-5 gap-3"
                   />

From 695bf807067959c5677f13af6c5a581ed4c693c3 Mon Sep 17 00:00:00 2001
From: abhimanyurajeesh <abhimanyurajeesh@gmail.com>
Date: Thu, 7 Aug 2025 15:53:22 +0530
Subject: [PATCH 10/10] Add author name extraction logic in DownloadPage
 component for improved data handling. This enhancement allows for better
 representation of author information in the download output.

---
 src/app/download/page.tsx | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/app/download/page.tsx b/src/app/download/page.tsx
index e0873d0..ff9934e 100644
--- a/src/app/download/page.tsx
+++ b/src/app/download/page.tsx
@@ -155,6 +155,13 @@ export default function DownloadPage() {
         let value = "";
         if (header === "slno") {
           value = (index + 1).toString();
+        } else if (header === "author") {
+          // Extract author name from author object
+          if (item.author && typeof item.author === "object") {
+            value = item.author.name || item.author.login || "";
+          } else {
+            value = item.author || "";
+          }
         } else {
           value = item[header];
           if (value === null || value === undefined) value = "";