v1.8.0.mv3

Author: sheepzh

README.md

@@ -20,7 +20,7 @@ Timer can
 - support to set the maximum time for browsing a specific website each day to help you keey away from time wasting.
 - support to export files formatted _.csv_ and _.json_.
 - support dark mode.
-- support to sync data with Github Gist across serveral browser clients.
+- support to sync data with GitHub Gist across serveral browser clients.
 
 ## Install
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "timer",
-  "version": "1.7.1",
+  "version": "1.8.0",
   "description": "Web timer",
   "homepage": "https://github.com/sheepzh/timer",
   "scripts": {
@@ -12,7 +12,11 @@
     "test": "jest --env=jsdom",
     "test-c": "jest --coverage --env=jsdom"
   },
-  "author": "zhy",
+  "author": {
+    "name": "zhy",
+    "email": "returnzhy1996@outlook.com",
+    "url": "https://www.github.com/sheepzh"
+  },
   "license": "MIT",
   "devDependencies": {
     "@crowdin/crowdin-api-client": "^1.22.1",
@@ -37,7 +41,7 @@
     "node-sass": "^8.0.0",
     "sass-loader": "^13.2.1",
     "style-loader": "^3.3.2",
-    "ts-jest": "^29.0.5",
+    "ts-jest": "^29.1.0",
     "ts-loader": "^9.4.2",
     "ts-node": "^10.9.1",
     "tsconfig-paths": "^4.1.2",
@@ -63,4 +67,4 @@
   "engines": {
     "node": ">=16"
   }
-}
+}

public/images/guide/beating.gif

@@ -38,4 +38,13 @@ export function getVersion(): string {
 
 export function setUninstallURL(url: string): Promise<void> {
     return new Promise(resolve => chrome.runtime.setUninstallURL(url, resolve))
+}
+
+/**
+ * Get the url of this extension
+ * 
+ * @param path The path relative to the root directory of this extension 
+ */
+export function getUrl(path: string): string {
+    return chrome.runtime.getURL(path)
 }

public/images/guide/home.png

@@ -1,3 +1,10 @@
+/**
+ * Copyright (c) 2023-present Hengyang Zhang
+ *
+ * This software is released under the MIT License.
+ * https://opensource.org/licenses/MIT
+ */
+
 import { handleError } from "./common"
 
 export function getTab(id: number): Promise<ChromeTab> {
@@ -7,6 +14,13 @@ export function getTab(id: number): Promise<ChromeTab> {
     }))
 }
 
+export function getCurrentTab(): Promise<ChromeTab> {
+    return new Promise(resolve => chrome.tabs.getCurrent(tab => {
+        handleError("getCurrentTab")
+        resolve(tab)
+    }))
+}
+
 export function createTab(param: chrome.tabs.CreateProperties | string): Promise<ChromeTab> {
     const prop: chrome.tabs.CreateProperties = typeof param === 'string' ? { url: param } : param
     return new Promise(resolve => chrome.tabs.create(prop, tab => {
@@ -15,6 +29,26 @@ export function createTab(param: chrome.tabs.CreateProperties | string): Promise
     }))
 }
 
+/**
+ * Create one tab after current tab.
+ * 
+ * Must not be invocked in background.js
+ */
+export async function createTabAfterCurrent(url: string): Promise<ChromeTab> {
+    const tab = await getCurrentTab()
+    if (!tab) {
+        // Current tab not found
+        return createTab(url)
+    } else {
+        const { windowId, index: currentIndex } = tab
+        return createTab({
+            url,
+            windowId,
+            index: (currentIndex ?? -1) + 1
+        })
+    }
+}
+
 export function listTabs(query?: chrome.tabs.QueryInfo): Promise<ChromeTab[]> {
     query = query || {}
     return new Promise(resolve => chrome.tabs.query(query, tabs => {

public/images/guide/pin.png

@@ -28,11 +28,7 @@ export function getFocusedNormalWindow(): Promise<chrome.windows.Window> {
 }
 
 export function getWindow(id: number): Promise<chrome.windows.Window> {
-    return new Promise(resolve =>
-        chrome.windows.get(id)
-            .then(win => resolve(win))
-            .catch(_ => resolve(undefined))
-    )
+    return new Promise(resolve => chrome.windows.get(id, win => resolve(win)))
 }
 
 type _Handler = (windowId: number) => void
@@ -41,5 +37,5 @@ export function onNormalWindowFocusChanged(handler: _Handler) {
     chrome.windows.onFocusChanged.addListener(windowId => {
         handleError('onWindowFocusChanged')
         handler(windowId)
-    }, { windowTypes: ['normal'] })
+    })
 }

src/api/chrome/runtime.ts

@@ -28,7 +28,7 @@ function computeSummary(site: timer.site.SiteKey, rows: timer.stat.Row[]): Summa
 
     const summary: Summary = { focus: 0, visit: 0, day: 0 }
     summary.firstDay = rows?.[0]?.date
-    rows.forEach(({ focus, time: visit }) => {
+    rows?.forEach(({ focus, time: visit }) => {
         summary.focus += focus
         summary.visit += visit
         focus && (summary.day += 1)

src/api/chrome/tab.ts

@@ -1,11 +1,11 @@
 /**
- * Copyright (c) 2021 Hengyang Zhang
+ * Copyright (c) 2021-present Hengyang Zhang
  * 
  * This software is released under the MIT License.
  * https://opensource.org/licenses/MIT
  */
 
-import { ElCard } from "element-plus"
+import { ElCard, ElScrollbar } from "element-plus"
 import ContentCard from "./content-card"
 import { defineComponent, h, useSlots } from "vue"
 
@@ -19,7 +19,7 @@ const _default = defineComponent(() => {
     } else {
         content && children.push(h(ContentCard, () => h(content)))
     }
-    return () => h("div", { class: "content-container" }, children)
+    return () => h(ElScrollbar, () => h("div", { class: "content-container" }, children))
 })
 
 export default _default