Skip to content

Commit 3418594

Browse files
vedansh-5vedansh-5
authored
Merge branch 'master' into dateSelect
2 parents 73e25ca + 4821275 commit 3418594

File tree

6 files changed

+989
-844
lines changed

6 files changed

+989
-844
lines changed

‎README.md

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,6 @@ Scrum Helper is not limited to the [FOSSASIA](https://github.com/fossasia) organ
120120
* Save your changes.
121121
* For Chrome: Rebuild or reload the extension in your browser (`chrome://extensions` → Refresh your extension).
122122
* For Firefox: Reload the temporary add-on by going to `about:debugging` → "This Firefox" → Click "Reload" next to your extension.
123-
124123
4. **How to Obtain a GitHub Personal Access Token**
125124

126125
- To use Scrum Helper with authenticated requests (for higher rate limits and private repositories), you need a GitHub personal access token.
@@ -155,8 +154,6 @@ Scrum Helper is not limited to the [FOSSASIA](https://github.com/fossasia) organ
155154
5. **Get Customized SCRUM Reports**
156155
- The reports will now be generated using contributions from your organization.
157156

158-
159-
160157
## About contributing
161158

162159
- Follow the Issues and PRs templates as far as possible.

‎src/index.css

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
@import "tailwindcss";
23
@tailwind base;
34
@tailwind components;
@@ -365,4 +366,4 @@ body,input,div,h3,h4,p,label,hr, #scrumReport{
365366
}
366367
.dark-mode .token-preview-char {
367368
box-shadow: 0 1px 4px rgba(0,0,0,0.18);
368-
}
369+
}

‎src/popup.html

Lines changed: 122 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<!DOCTYPE html>
22
<html>
3+
34
<head>
45
<meta charset="UTF-8">
56
<meta name="viewport" content="width=device-width, initial-scale=1.0">
@@ -8,58 +9,67 @@
89
<link rel="stylesheet" type="text/css" href="index.css">
910
<script src="./scripts/fontawesome.js"></script>
1011
<style type="text/css">
11-
html,body{
12-
width: 375px !important;
13-
height: 600px !important;
14-
max-height: 600px !important;
15-
overflow-y: scroll;
16-
background: #eae4e4;
17-
}
18-
</style>
12+
html,
13+
body {
14+
width: 375px !important;
15+
height: 600px !important;
16+
max-height: 600px !important;
17+
overflow-y: scroll;
18+
background: #eae4e4;
19+
}
20+
</style>
1921
</head>
22+
2023
<body>
2124
<div class="pl-1 py-4 rounded-2xl">
2225
<div class="bg-white px-4 py-4 mx-2 mb-2 rounded-3xl">
23-
<div class="flex justify-between py-2">
24-
<h3 id="scrumHelperHeading" class="text-3xl font-semibold cursor-pointer">Scrum Helper</h3>
25-
<img src="icons/night-mode.png" alt="Night Mode" class="w-7 h-7 mx-3 cursor-pointer">
26-
</div>
27-
<div>
28-
<p class="">Report your development progress by auto-fetching your Git activity for a selected period</p>
29-
</div>
30-
26+
<div class="flex justify-between py-2">
27+
<h3 id="scrumHelperHeading" class="text-3xl font-semibold cursor-pointer">Scrum Helper</h3>
28+
<img src="icons/night-mode.png" alt="Night Mode" class="w-7 h-7 mx-3 cursor-pointer">
29+
</div>
30+
<div>
31+
<p class="">Report your development progress by auto-fetching your Git activity for a selected period</p>
32+
</div>
33+
3134
<div class="center mt-2 flex justify-between">
32-
<label class="flex items-center justify-center gap-2 ">
33-
Disable
34-
<input type="checkbox" value="" id="enable" class="sr-only peer" >
35-
<div class="relative w-11 h-6 bg-gray-200 rounded-full peer peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 dark:bg-gray-700 peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-0.5 after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600 dark:peer-checked:bg-blue-600"></div>
36-
<span class=""></span>
37-
Enable
38-
</label>
39-
<div class="flex">
40-
<button id="homeButton" title="Go to Report" class="ml-1 p-2 rounded hover:bg-gray-200 dark:hover:bg-gray-700 transition">
41-
<i class="fa fa-home text-2xl text-gray-600 dark:text-gray-300"></i>
42-
</button>
43-
<button id="settingsToggle">
44-
<img id="settingsIcon" src="icons/settings-light.png" alt="Settings" class="w-6 h-6 mx-3 cursor-pointer">
45-
</button>
35+
<label class="flex items-center justify-center gap-2 ">
36+
Disable
37+
<input type="checkbox" value="" id="enable" class="sr-only peer">
38+
<div
39+
class="relative w-11 h-6 bg-gray-200 rounded-full peer peer-focus:ring-blue-300 dark:peer-focus:ring-blue-800 dark:bg-gray-700 peer-checked:after:translate-x-full rtl:peer-checked:after:-translate-x-full peer-checked:after:border-white after:content-[''] after:absolute after:top-0.5 after:start-[2px] after:bg-white after:border-gray-300 after:border after:rounded-full after:h-5 after:w-5 after:transition-all dark:border-gray-600 peer-checked:bg-blue-600 dark:peer-checked:bg-blue-600">
4640
</div>
41+
<span class=""></span>
42+
Enable
43+
</label>
44+
<div class="flex">
45+
<button id="homeButton" title="Go to Report"
46+
class="ml-1 p-2 rounded hover:bg-gray-200 dark:hover:bg-gray-700 transition">
47+
<i class="fa fa-home text-2xl text-gray-600 dark:text-gray-300"></i>
48+
</button>
49+
<button id="settingsToggle">
50+
<img id="settingsIcon" src="icons/settings-light.png" alt="Settings" class="w-6 h-6 mx-3 cursor-pointer">
51+
</button>
52+
</div>
4753
</div>
4854
</div>
49-
55+
5056
<div class="rounded-2xl">
5157
<div class=" border-gray-100 border-2 bg-white rounded-3xl px-4 py-4 mx-2 my-2">
5258

5359
<div id="reportSection" class="tab-content">
5460
<div>
5561
<h4>Your Project Name</h4>
56-
<input id="projectName" type="text" class="w-full border-2 border-gray-200 bg-gray-200 rounded-xl text-gray-800 p-2 my-2" placeholder="Enter your project name">
62+
<input id="projectName" type="text"
63+
class="w-full border-2 border-gray-200 bg-gray-200 rounded-xl text-gray-800 p-2 my-2"
64+
placeholder="Enter your project name">
5765
</div>
5866
<div>
5967
<h4>Your Github Username</h4>
60-
<input id="githubUsername" type="text" class="w-full border-2 border-gray-200 bg-gray-200 rounded-xl text-gray-800 p-2 my-2" placeholder="Required for fetching your contributions">
68+
<input id="githubUsername" type="text"
69+
class="w-full border-2 border-gray-200 bg-gray-200 rounded-xl text-gray-800 p-2 my-2"
70+
placeholder="Required for fetching your contributions">
6171
</div>
62-
72+
6373
<div>
6474
<p class="text-sm">Fetch your contributions between:</p>
6575
<div class="flex justify-between items-center my-2 mx-4">
@@ -72,7 +82,7 @@ <h4>Your Github Username</h4>
7282
<label for="yesterdayContribution">Last 1 day</label>
7383
</div>
7484
</div>
75-
85+
7686
<div id="customDateContainer" class="flex justify-between items-center mt-2">
7787
<div>
7888
<label for="startingDate">Start Date:</label>
@@ -84,38 +94,56 @@ <h4>Your Github Username</h4>
8494
</div>
8595
</div>
8696
</div>
87-
97+
8898
<div class="col s12">
8999
<br />
90100
<input type="checkbox" id="showOpenLabel" class="form-checkbox h-4 w-4 text-blue-600">
91-
<label id="checkboxLabel" for="showOpenLabel" class="text-gray-700 font-medium text-sm">Show Open/Closed Label</label>
101+
<label id="checkboxLabel" for="showOpenLabel" class="text-gray-700 font-medium text-sm">Show Open/Closed
102+
Label</label>
92103
</div>
93104
<div class="my-4">
94105
<p class="text-sm font-medium">What is blocking you from making progress?</p>
95-
<input id="userReason" type="text" class="w-full text-gray-800 mt-3 rounded-xl px-4 py-1" placeholder="Enter your reason">
106+
<input id="userReason" type="text" class="w-full text-gray-800 mt-3 rounded-xl px-4 py-1"
107+
placeholder="Enter your reason">
96108
<hr class="border-t-2 border-gray-700 mt-1 ">
97109
</div>
98110
<div>
99111
<div>
100112
<h6 class="text-base font-semibold">Scrum Report</h6>
101-
<div id="scrumReport"
102-
contenteditable="true"
103-
class="min-h-[200px] overflow-y-auto whitespace-pre-wrap border-2 border-gray-200 bg-gray-100 rounded-xl text-gray-800 p-2 my-2">
113+
<div id="scrumReport" contenteditable="true"
114+
class="min-h-[200px] overflow-y-auto whitespace-pre-wrap border-2 border-gray-200 bg-gray-100 rounded-xl text-gray-800 p-2 my-2">
104115
</div>
105116
</div>
106117
<div class="flex justify-between gap-2">
107-
<button id="generateReport" class="flex items-center gap-2 bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 px-4 rounded">
108-
<i class="fa fa-refresh"></i> Generate Report
118+
<button id="generateReport"
119+
class="flex items-center gap-2 bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 px-4 rounded">
120+
<i class="fa fa-refresh"></i> Generate Report
109121
</button>
110-
<button id="copyReport" class="flex items-center gap-2 bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 px-4 rounded">
111-
<i class="fa fa-copy"></i> Copy Report
122+
<button id="copyReport"
123+
class="flex items-center gap-2 bg-blue-600 hover:bg-blue-700 text-white font-medium py-2 px-4 rounded">
124+
<i class="fa fa-copy"></i> Copy Report
112125
</button>
113126
</div>
114127
</div>
115128
</div>
116129

117130
<div id="settingsSection" class="tab-content hidden">
118-
131+
<div class="">
132+
<div class="flex items-center mt-4">
133+
<h4>Organisation Name</h4>
134+
<span class="tooltip-container ml-2">
135+
<i class="fa fa-question-circle question-icon"></i>
136+
<span class="tooltip-bubble">
137+
<b>Which organisation's GitHub activity?</b><br>
138+
Enter the GitHub organisation name to fetch activites for. Default is <b>fossasia</b>.
139+
Organisation name is not case-sensitive.
140+
</span>
141+
</span>
142+
</div>
143+
<input id="orgInput" type="text"
144+
class="w-full border-2 border-gray-200 bg-gray-200 rounded-xl text-gray-800 p-2 my-2"
145+
placeholder="Enter organisation name (default: fossasia)">
146+
</div>
119147
<div class="">
120148
<div class="flex items-center justify-between">
121149
<div class="flex">
@@ -124,9 +152,13 @@ <h4>Your Github Token</h4>
124152
<i class="fa fa-question-circle question-icon"></i>
125153
<span class="tooltip-bubble">
126154
<b>Why is it recommended to add a GitHub token?</b><br>
127-
Scrum Helper works without a GitHub token, but adding a personal access token is recommended for a better experience. It raises your API limits, allows access to private repos (if permitted), and improves accuracy and speed. Tokens are stored locally and never sent to us and used only to fetch your git data. You can add one anytime in the extension settings.<br><br>
155+
Scrum Helper works without a GitHub token, but adding a personal access token is recommended for a
156+
better experience. It raises your API limits, allows access to private repos (if permitted), and
157+
improves accuracy and speed. Tokens are stored locally and never sent to us and used only to fetch
158+
your git data. You can add one anytime in the extension settings.<br><br>
128159
<b>How to obtain:</b><br>
129-
1. Go to <a href="https://github.com/settings/tokens" target="_blank" style="color:#2563eb;text-decoration:underline;">GitHub Developer Settings</a>.<br>
160+
1. Go to <a href="https://github.com/settings/tokens" target="_blank"
161+
style="color:#2563eb;text-decoration:underline;">GitHub Developer Settings</a>.<br>
130162
3. Click "Generate new token", select classic token<br>
131163
4. Paste it here.<br>
132164
<i>Keep your token secret!</i>
@@ -137,19 +169,26 @@ <h4>Your Github Token</h4>
137169
<i id="tokenEyeIcon" class="fa fa-eye text-gray-600"></i>
138170
</button>
139171
</div>
140-
<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">
172+
<input id="githubToken" type="password"
173+
class="w-full border-2 border-gray-200 bg-gray-200 rounded-xl text-gray-800 p-2 my-2 pr-10"
174+
placeholder="Required for making authenticated requests">
141175
<p class="text-sm font-medium">Enter cache TTL <span class="text-sm font-normal">(in minutes)</span>
142176
<span class="tooltip-container">
143177
<i class="fa fa-question-circle question-icon"></i>
144178
<span class="tooltip-bubble">
145-
We are caching the data to avoid redundant calls. By default the cache expires after 10 minutes, you can change it here to your desired time. We have given a refresh cache button in case you want to fetch fresh data right now.
179+
We are caching the data to avoid redundant calls. By default the cache expires after 10 minutes, you
180+
can change it here to your desired time. We have given a refresh cache button in case you want to
181+
fetch fresh data right now.
146182
</span>
147183
</span>
148-
</p>
149-
<input type="text" id="cacheInput" 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)">
184+
</p>
185+
<input type="text" id="cacheInput"
186+
class="w-full border-2 border-gray-200 bg-gray-200 rounded-xl text-gray-800 p-2 my-2"
187+
placeholder="Write Cache TTL in minutes (Default 10 minutes)">
150188
</div>
151189
<div class="">
152-
<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">
190+
<button id="refreshCache"
191+
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">
153192
<i class="fa fa-refresh"></i>
154193
<span>Refresh Data (bypass cache)</span>
155194
</button>
@@ -158,53 +197,55 @@ <h4>Your Github Token</h4>
158197
Use this button to fetch fresh data immediately.
159198
</p>
160199
</div>
161-
200+
162201
</div>
163202

164203
<!-- asdfghjklkjhgfdsasdfghjkjhgfdsasdfghjk -->
165204
<div class="border-gray-100 border-2 bg-white rounded-3xl px-4 py-2 mx-2 my-2">
166205
<div>
167206
<h4 class="font-semibold text-xl">Note:</h4>
168207
<ul class="text-xs list-disc list-inside">
169-
<li>The PRs fetched are based on the most recent review by any contributor. If you reviewed a PR 10 days ago and someone else reviewed it 2 days ago, it will still appear in your activity for the past week. (<a target="_blank" href="https://github.com/fossasia/scrum_helper/issues/20">See this issue</a>.)
208+
<li>The PRs fetched are based on the most recent review by any contributor. If you reviewed a PR 10 days
209+
ago and someone else reviewed it 2 days ago, it will still appear in your activity for the past week.
210+
(<a target="_blank" href="https://github.com/fossasia/scrum_helper/issues/20">See this issue</a>.)
170211
</li>
171-
<li>Please note that some discrepancies may occur in the generated SCRUM. We recommend manually reviewing and editing the report to ensure accuracy before sharing
212+
<li>Please note that some discrepancies may occur in the generated SCRUM. We recommend manually reviewing
213+
and editing the report to ensure accuracy before sharing
172214
</li>
173215
</ul>
174216
</div>
175217
</div>
176-
</div>
218+
</div>
177219

178-
<div class="mt-6 border-t border-gray-300">
179-
<div class="bg-white rounded-3xl mx-2 mt-4 mb-2 p-4 border border-gray-100 shadow-sm">
180-
<div class="flex items-center justify-center space-x-3">
181-
<a target="_blank"
182-
href="https://github.com/fossasia/scrum_helper"
183-
class="bg-blue-50 hover:bg-blue-100 text-blue-600 transition-all duration-200 rounded-lg px-4 py-2 flex items-center space-x-2">
184-
<i class="fa fa-code text-sm"></i>
185-
<span class="text-sm font-medium">View Code</span>
186-
</a>
187-
<a target="_blank"
188-
href="https://github.com/fossasia/scrum_helper/issues"
189-
class="bg-blue-50 hover:bg-blue-100 text-blue-600 transition-all duration-200 rounded-lg px-4 py-2 flex items-center space-x-2">
190-
<i class="fa fa-bug text-sm"></i>
191-
<span class="text-sm font-medium">Report Issue</span>
192-
</a>
193-
</div>
194-
</div>
195-
<div class="mt-3 pt-3 border-t border-gray-200 flex justify-center items-center py-5">
196-
<p class="text-xs text-gray-600 text-center">
197-
Made with ❤️ by <strong>FOSSASIA</strong> •
198-
<span class="text-gray-500 dark:text-gray-300">v2.0</span>
199-
</p>
220+
<div class="mt-6 border-t border-gray-300">
221+
<div class="bg-white rounded-3xl mx-2 mt-4 mb-2 p-4 border border-gray-100 shadow-sm">
222+
<div class="flex items-center justify-center space-x-3">
223+
<a target="_blank" href="https://github.com/fossasia/scrum_helper"
224+
class="bg-blue-50 hover:bg-blue-100 text-blue-600 transition-all duration-200 rounded-lg px-4 py-2 flex items-center space-x-2">
225+
<i class="fa fa-code text-sm"></i>
226+
<span class="text-sm font-medium">View Code</span>
227+
</a>
228+
<a target="_blank" href="https://github.com/fossasia/scrum_helper/issues"
229+
class="bg-blue-50 hover:bg-blue-100 text-blue-600 transition-all duration-200 rounded-lg px-4 py-2 flex items-center space-x-2">
230+
<i class="fa fa-bug text-sm"></i>
231+
<span class="text-sm font-medium">Report Issue</span>
232+
</a>
233+
</div>
234+
</div>
235+
<div class="mt-3 pt-3 border-t border-gray-200 flex justify-center items-center py-5">
236+
<p class="text-xs text-gray-600 text-center">
237+
Made with ❤️ by <strong>FOSSASIA</strong> •
238+
<span class="text-gray-500 dark:text-gray-300">v2.0</span>
239+
</p>
240+
</div>
241+
</div>
200242
</div>
201243
</div>
202-
</div>
203-
</div>
204244
<script src="scripts/jquery-3.2.1.min.js"></script>
205245
<script type="text/javascript" type="text/javascript" src="materialize/js/materialize.min.js"></script>
206246
<script src="scripts/main.js"></script>
207247
<script src="scripts/scrumHelper.js"></script>
208248
<script src="scripts/popup.js"></script>
209249
</body>
250+
210251
</html>

0 commit comments

Comments
 (0)