Merge branch 'main' into qr

Author: sheepzh

.vscode/settings.json

@@ -13,6 +13,7 @@
     "files.eol": "\n",
     "cSpell.words": [
         "Auths",
+        "Cascader",
         "countup",
         "daterange",
         "dont",

CHANGELOG.md

@@ -4,6 +4,22 @@ All notable changes to Time Tracker will be documented in this file.
 
 It is worth mentioning that the release time of each change refers to the time when the installation package is submitted to the webstore. It is about one week for Edge to moderate packages, while only 1-2 days for Chrome and Firefox.
 
+## [2.5.6] - 2024-12-02
+
+-   Fixed bugs of badge
+
+## [2.5.5] - 2024-11-29
+
+-   Supported option to stop tracking if no activity detected
+
+## [2.5.4] - 2024-11-25
+
+-   Optimized the performance of popup page
+
+## [2.5.3] - 2024-11-23
+
+-   Refactored the popup page
+
 ## [2.5.2] - 2024-11-03
 
 -   Fixed a bug of Firefox v132

README.md

@@ -10,19 +10,6 @@
 
 Time Tracker is a browser extension to track the time you spent on all websites. It's built by webpack, TypeScript and Element-plus. And you can install it for Firefox, Chrome and Edge.
 
-Time Tracker can
-
--   help you count the time you browsing and the visit count on each website.
--   help you count the time you read local files with browsers.
--   help you analyze your browsing habit by time period and display it as a histogram.
--   support whitelist to filter out websites that need not stat.
--   combine statistics result of multiple sites, and supports to customize the rules of combination.
--   support to set the maximum time for browsing a specific website each day to help you key away from time wasting.
--   support to export files formatted _.csv_ and _.json_.
--   support dark mode.
--   support to sync data with GitHub Gist across several browser clients.
--   support to count the time of any URLs described by Ant Expressions, e.g. github.com/sheepzh/timer/\*\*
-
 ## Install
 
 [![Chrome](https://img.shields.io/chrome-web-store/v/dkdhhcbjijekmneelocdllcldcpmekmm?color=orange&label=Google%20Chrome)](https://chrome.google.com/webstore/detail/%E7%BD%91%E8%B4%B9%E5%BE%88%E8%B4%B5-%E4%B8%8A%E7%BD%91%E6%97%B6%E9%97%B4%E7%BB%9F%E8%AE%A1/dkdhhcbjijekmneelocdllcldcpmekmm?hl=zh-CN)
@@ -41,6 +28,29 @@ Time Tracker can
 
 ![User Count](https://gist.githubusercontent.com/sheepzh/6aaf4c22f909db73b533491167da129b/raw/user_count.svg)
 
+
+## Screenshots
+
+<div align="center">
+    <img src="./doc/screenshot/popup.png" width="100%">
+    <p>Pie Chart on the Popup Page</p>
+</div>
+
+<div align="center">
+    <img src="./doc/screenshot/app.png" width="100%">
+    <p>Dashboard</p>
+</div>
+
+<div align="center">
+    <img src="./doc/screenshot/analyze.png" width="100%">
+    <p>Analytical Report</p>
+</div>
+
+<div align="center">
+    <img src="./doc/screenshot/habit.png" width="100%">
+    <p>Habit Report</p>
+</div>
+
 ## Contribution
 
 There are some things you can do to contribute to this software.

doc/screenshot/analyze.png

@@ -1,6 +1,6 @@
 {
     "name": "timer",
-    "version": "2.5.2",
+    "version": "2.5.6",
     "description": "Time tracker",
     "homepage": "https://www.wfhg.cc",
     "scripts": {
@@ -26,14 +26,14 @@
     "devDependencies": {
         "@babel/plugin-transform-modules-commonjs": "^7.25.9",
         "@babel/preset-env": "^7.26.0",
-        "@crowdin/crowdin-api-client": "^1.39.0",
-        "@types/chrome": "0.0.280",
+        "@crowdin/crowdin-api-client": "^1.39.1",
+        "@types/chrome": "0.0.287",
         "@types/copy-webpack-plugin": "^10.1.3",
         "@types/decompress": "^4.2.7",
         "@types/echarts": "^4.9.22",
         "@types/generate-json-webpack-plugin": "^0.3.7",
         "@types/jest": "^29.5.14",
-        "@types/node": "^22.8.7",
+        "@types/node": "^22.10.1",
         "@types/psl": "^1.1.3",
         "@types/punycode": "^2.1.4",
         "@types/webpack": "^5.28.5",
@@ -43,43 +43,43 @@
         "copy-webpack-plugin": "^12.0.2",
         "css-loader": "^7.1.2",
         "decompress": "^4.2.1",
-        "eslint": "^9.14.0",
+        "eslint": "^9.16.0",
         "filemanager-webpack-plugin": "^8.0.0",
         "generate-json-webpack-plugin": "^2.0.0",
         "html-webpack-plugin": "^5.6.3",
         "jest": "^29.7.0",
         "jest-environment-jsdom": "^29.7.0",
         "mini-css-extract-plugin": "^2.9.2",
-        "postcss": "^8.4.47",
+        "postcss": "^8.4.49",
         "postcss-loader": "^8.1.1",
-        "postcss-rtlcss": "^5.5.0",
-        "sass": "^1.80.6",
+        "postcss-rtlcss": "^5.5.1",
+        "sass": "^1.81.0",
         "sass-loader": "^16.0.3",
         "style-loader": "^4.0.0",
         "ts-jest": "^29.2.5",
         "ts-loader": "^9.5.1",
         "ts-node": "^10.9.2",
         "tsconfig-paths": "^4.2.0",
         "tslib": "^2.8.1",
-        "typescript": "5.6.3",
+        "typescript": "5.7.2",
         "url-loader": "^4.1.1",
         "webpack": "^5.96.1",
         "webpack-bundle-analyzer": "^4.10.2",
         "webpack-cli": "^5.1.4"
     },
     "dependencies": {
         "@element-plus/icons-vue": "^2.3.1",
-        "@vueuse/core": "^11.2.0",
+        "@vueuse/core": "^12.0.0",
         "countup.js": "^2.8.0",
         "echarts": "^5.5.1",
-        "element-plus": "2.8.7",
+        "element-plus": "2.9.0",
         "js-base64": "^3.7.7",
         "punycode": "^2.3.1",
         "stream-browserify": "^3.0.0",
-        "vue": "^3.5.12",
-        "vue-router": "^4.4.5"
+        "vue": "^3.5.13",
+        "vue-router": "^4.5.0"
     },
     "engines": {
         "node": ">=20"
     }
-}
+}

doc/screenshot/app.png

@@ -3,8 +3,8 @@ import { handleError } from "./common"
 
 const action = IS_MV3 ? chrome.action : chrome.browserAction
 
-export function setBadgeText(text: string, tabId: number): Promise<void> {
-    return new Promise(resolve => action?.setBadgeText({ tabId, text }, () => {
+export function setBadgeText(text: string): Promise<void> {
+    return new Promise(resolve => action?.setBadgeText({ text }, () => {
         handleError('setBadgeText')
         resolve()
     }))