From fa63ad29e7c7b32fb32cba6b52dd8ff51bc7d9f5 Mon Sep 17 00:00:00 2001 From: Alex Date: Mon, 21 Dec 2020 18:30:13 +0300 Subject: [PATCH 001/341] Fix rounding for time for badge text --- src/manifest.json | 2 +- src/scripts/activity.js | 2 +- src/scripts/common.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/manifest.json b/src/manifest.json index 1aee903..b760023 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,7 +3,7 @@ "name": "Web Activity Time Tracker", "short_name": "Web Time Tracker", - "version": "1.5.2", + "version": "1.5.3", "minimum_chrome_version": "26", "description": "Track and limit time your activity in the browser every day.", diff --git a/src/scripts/activity.js b/src/scripts/activity.js index 15a562e..f35c8d7 100644 --- a/src/scripts/activity.js +++ b/src/scripts/activity.js @@ -128,7 +128,7 @@ class Activity { } closeIntervalForCurrentTab() { - if (currentTab !== '') { + if (currentTab !== '' && timeIntervalList != undefined) { var item = timeIntervalList.find(o => o.domain === currentTab && o.day == new Date().toLocaleDateString("en-US")); if (item != undefined) item.closeInterval(); diff --git a/src/scripts/common.js b/src/scripts/common.js index b56f86a..7629601 100644 --- a/src/scripts/common.js +++ b/src/scripts/common.js @@ -73,7 +73,7 @@ function convertTimeToSummaryTime(time) { function convertSummaryTimeToBadgeString(summaryTime) { var sec = (summaryTime); var min = (summaryTime / 60).toFixed(0); - var hours = (summaryTime / (60 * 60)).toFixed(0); + var hours = (summaryTime / (60 * 60)).toFixed(1); var days = (summaryTime / (60 * 60 * 24)).toFixed(0); if (sec < 60) { From b366d63cc9624dd1cc4d2da5ef9f5fac7350908d Mon Sep 17 00:00:00 2001 From: Kimball Leavitt Date: Mon, 15 Feb 2021 15:46:10 -0700 Subject: [PATCH 002/341] improve wording for youtube/netflix permissions --- src/options.html | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/options.html b/src/options.html index 79601b5..f274ddb 100644 --- a/src/options.html +++ b/src/options.html @@ -98,14 +98,12 @@
-
@@ -131,7 +129,7 @@
@@ -237,4 +235,4 @@ - \ No newline at end of file + From 8f28e822a91c246e490d987f0fdd8bf93fb53ca4 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 23 Feb 2021 11:35:25 +0300 Subject: [PATCH 003/341] Changed color text for badge --- src/scripts/background.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/scripts/background.js b/src/scripts/background.js index 47d3eef..15254b2 100644 --- a/src/scripts/background.js +++ b/src/scripts/background.js @@ -76,7 +76,7 @@ function mainTRacker(activeUrl, tab, activeTab) { tab.incSummaryTime(); } if (setting_view_in_badge === true) { - chrome.browserAction.setBadgeBackgroundColor({ color: [0, 0, 0, 0] }) + chrome.browserAction.setBadgeBackgroundColor({ color: '#1aa1434d' }) var today = new Date().toLocaleDateString("en-US"); var summary = tab.days.find(s => s.date === today).summary; chrome.browserAction.setBadgeText({ From 0835f0e9658826c92762fd11614b01670860cb9e Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 23 Feb 2021 11:40:48 +0300 Subject: [PATCH 004/341] Added dark mode --- src/index.html | 1 + src/manifest.json | 2 +- src/options.html | 12 +++- src/scripts/background.js | 6 ++ src/scripts/chart/chart-core.js | 116 +++++++++++++++++++++++--------- src/scripts/common.js | 2 + src/scripts/settings.js | 13 +++- src/scripts/ui.js | 9 +++ src/scripts/webact.js | 3 + src/style/webact.css | 44 ++++++++++-- 10 files changed, 169 insertions(+), 39 deletions(-) diff --git a/src/index.html b/src/index.html index 90337fa..5171716 100644 --- a/src/index.html +++ b/src/index.html @@ -35,6 +35,7 @@
✖

You can:

+

➤ enable dark mode

➤ set daily limits for sites

➤ set notifications after a certain time has elapsed

➤ set a list of sites with no tracking

diff --git a/src/manifest.json b/src/manifest.json index b760023..a5426e7 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -3,7 +3,7 @@ "name": "Web Activity Time Tracker", "short_name": "Web Time Tracker", - "version": "1.5.3", + "version": "1.5.4", "minimum_chrome_version": "26", "description": "Track and limit time your activity in the browser every day.", diff --git a/src/options.html b/src/options.html index f274ddb..dd248f9 100644 --- a/src/options.html +++ b/src/options.html @@ -25,6 +25,7 @@ Limits Notifications About + Donate
@@ -32,6 +33,12 @@ Display time tracker in icon +
+ +
@@ -219,8 +226,9 @@ href="https://chrome.google.com/webstore/detail/web-activity-time-tracker/hhfnghjdeddcfegfekjeihfmbjenlomm/reviews" target="_blank">Let me know!
-
-
+
+