Merge branch 'master' into preview-bug

Author: Preeti9764

src/index.css

@@ -416,5 +416,28 @@ hr,
 }
 
 .dark-mode .token-preview-char {
-    box-shadow: 0 1px 4px rgba(0, 0, 0, 0.18);
+    box-shadow: 0 1px 4px rgba(0,0,0,0.18);
+}
+
+.popup-commit-list {
+    margin: 8px 0 8px 18px;
+    padding-left: 0;
+    border-left: 2px solid #e0e7ff;
+    background: #f8fafc;
+    border-radius: 6px;
+}
+.popup-commit-list li {
+    list-style: none;
+    margin: 8px 0 8px 0;
+    padding-left: 0;
+}
+.popup-commit-list .commit-meta {
+    color: #64748b;
+    font-size: 11px;
+    margin-left: 8px;
+}
+.popup-commit-list a {
+    color: #2563eb;
+    font-weight: 500;
+    text-decoration: underline;
 }

src/popup.html

@@ -174,9 +174,22 @@ <h4>Your Github Token</h4>
 								<i id="tokenEyeIcon" class="fa fa-eye text-gray-600"></i>
 							</button>
 						</div>
-						<input id="githubToken" type="password"
-							class="w-full border-2 border-gray-200 bg-gray-200 rounded-xl text-gray-800 p-2 my-2 pr-10"
-							placeholder="Required for making authenticated requests">
+						<input id="githubToken" type="password" class="w-full border-2 border-gray-200 bg-gray-200 rounded-xl text-gray-800 p-2 my-2 pr-10" placeholder="Required for making authenticated requests">
+
+						
+
+						<div class="col s12 my-4 ">
+							<div class="flex items-center gap-2">
+								<input type="checkbox" id="showCommits" checked class="form-checkbox h-4 w-4 text-blue-600 ">
+								<label id="showCommitsLabel" for="showCommits" class="text-gray-700 font-medium text-sm flex items-center gap-1 ">Show commits made within date range in Open PRs</label> <span class="tooltip-container">
+								<i class="fa fa-question-circle question-icon"></i>
+								<span class="tooltip-bubble">
+									Github Token required.
+								</span>
+							</span>
+							</div>
+						</div>
+
 						<p class="text-sm font-medium">Enter cache TTL <span class="text-sm font-normal">(in minutes)</span>
 							<span class="tooltip-container">
 								<i class="fa fa-question-circle question-icon"></i>
@@ -191,6 +204,7 @@ <h4>Your Github Token</h4>
 							class="w-full border-2 border-gray-200 bg-gray-200 rounded-xl text-gray-800  p-2 my-2"
 							placeholder="Write Cache TTL in minutes (Default 10 minutes)">
 					</div>
+
 					<div class="">
 						<button id="refreshCache"
 							class="w-full mt-3 bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 px-4 rounded flex items-center justify-center gap-2 transition-colors duration-200">

src/scripts/main.js

@@ -9,6 +9,7 @@ let startingDateElement = document.getElementById('startingDate');
 let endingDateElement = document.getElementById('endingDate');
 let showOpenLabelElement = document.getElementById('showOpenLabel');
 let userReasonElement = document.getElementById('userReason');
+let showCommitsElement = document.getElementById('showCommits');
 
 function handleBodyOnLoad() {
 	chrome.storage.local.get(
@@ -24,6 +25,7 @@ function handleBodyOnLoad() {
 			'yesterdayContribution',
 			'cacheInput',
 			'githubToken',
+			'showCommits',
 		],
 		(items) => {
 			if (items.githubUsername) {
@@ -77,6 +79,12 @@ function handleBodyOnLoad() {
 				yesterdayContributionElement.checked = true;
 				handleYesterdayContributionChange();
 			}
+			if (items.showCommits){
+				showCommitsElement.checked = items.showCommits;
+			} else {
+				showCommitsElement.checked = false;
+				handleShowCommitsChange();
+			}
 		},
 	);
 }
@@ -241,12 +249,19 @@ function handleUserReasonChange() {
 	let value = userReasonElement.value;
 	chrome.storage.local.set({ userReason: value });
 }
+
+function handleShowCommitsChange() {
+    let value = showCommitsElement.checked;
+    chrome.storage.local.set({ showCommits: value });
+}
+
 enableToggleElement.addEventListener('change', handleEnableChange);
 githubUsernameElement.addEventListener('keyup', handleGithubUsernameChange);
 githubTokenElement.addEventListener('keyup', handleGithubTokenChange);
 cacheInputElement.addEventListener('keyup', handleCacheInputChange);
 projectNameElement.addEventListener('keyup', handleProjectNameChange);
 startingDateElement.addEventListener('change', handleStartingDateChange);
+showCommitsElement.addEventListener('change', handleShowCommitsChange);
 endingDateElement.addEventListener('change', handleEndingDateChange);
 lastWeekContributionElement.addEventListener('change', handleLastWeekContributionChange);
 yesterdayContributionElement.addEventListener('change', handleYesterdayContributionChange);

src/scripts/popup.js

@@ -129,6 +129,7 @@ document.addEventListener('DOMContentLoaded', function () {
             'githubToken',
             'projectName',
             'settingsToggle',
+            
         ];
 
         const radios = document.querySelectorAll('input[name="timeframe"]');
@@ -592,9 +593,7 @@ document.getElementById('refreshCache').addEventListener('click', async function
 
     try {
         // Clear local cache
-        await new Promise(resolve => {
-            chrome.storage.local.remove('githubCache', resolve);
-        });
+        await forceGithubDataRefresh();
 
         // Clear the scrum report
         const scrumReport = document.getElementById('scrumReport');