Add feedback link while in zh_CN

Author: sheepzh

src/background/index.ts

@@ -14,9 +14,9 @@ setInterval(() => {
     const now = Date.now()
     const realInterval = now - lastLoopTime
     lastLoopTime = now
-    let focusHost = ''
     chrome.windows.getAll(windows => {
         const hostSet: Set<string> = new Set()
+        let focusHost = ''
         Promise.all(
             windows.map(w => {
                 const isFocusWindow = !!w.focused

src/locale/components/popup.ts

@@ -9,6 +9,7 @@ export type PopupMessage = {
     totalTime: string
     totalCount: string
     otherLabel: string
+    feedback: string
 }
 const _default: Messages<PopupMessage> = {
     zh_CN: {
@@ -19,7 +20,8 @@ const _default: Messages<PopupMessage> = {
         saveAsImageTitle: '保存',
         totalTime: '共 {totalTime}',
         totalCount: '共 {totalCount} 次',
-        otherLabel: '其他'
+        otherLabel: '其他',
+        feedback: '使用反馈'
     },
     en: {
         title: 'Today\'s Data',
@@ -29,7 +31,8 @@ const _default: Messages<PopupMessage> = {
         saveAsImageTitle: 'Save',
         totalTime: 'Total {totalTime}',
         totalCount: 'Total {totalCount} times',
-        otherLabel: 'Others'
+        otherLabel: 'Others',
+        feedback: 'Feedback'
     },
     ja: {
         title: '今日のデータ',
@@ -39,7 +42,8 @@ const _default: Messages<PopupMessage> = {
         saveAsImageTitle: 'ダウンロード',
         totalTime: '合計 {totalTime}',
         totalCount: '合計 {totalCount} 回',
-        otherLabel: 'その他'
+        otherLabel: 'その他',
+        feedback: 'フィードバック'
     }
 }
 

src/popup/app.ts

@@ -10,12 +10,13 @@ use([TitleComponent, ToolboxComponent, TooltipComponent, LegendComponent, Canvas
 
 import { ElLink, ElOption, ElSelect, ElSwitch, ElTooltip } from "element-plus"
 import { computed, ComputedRef, defineComponent, h, onMounted, Ref, ref, watch } from "vue"
-import { t } from "../common/vue-i18n"
+import { locale, t } from "../common/vue-i18n"
 import SiteInfo, { ALL_SITE_ITEMS, SiteItem } from "../entity/dto/site-info"
 import timerService, { SortDirect, TimerQueryParam } from "../service/timer-service"
 import { IS_FIREFOX } from "../util/constant/environment"
-import { FAVICON } from "../util/constant/url"
+import { FAVICON, ZH_FEEDBACK_PAGE } from "../util/constant/url"
 import { formatPeriodCommon, formatTime } from "../util/time"
+import { Locale } from "../locale/constant"
 
 
 const DEFAULT_DATE_TYPE: SiteItem = 'focus'
@@ -232,8 +233,21 @@ export default defineComponent(() => {
         },
         () => t('popup.viewMore')
     )
+    const feedback = () => h(ElLink,
+        {
+            icon: 'el-icon-edit',
+            class: 'option-right',
+            onClick: () => chrome.tabs.create({ url: ZH_FEEDBACK_PAGE })
+        },
+        () => t('popup.feedback'))
+
+    const footerItems = () => {
+        const result = [versionAndTotalInfo(), typeSelect(), mergeDomainSwitch(), link()]
+        locale === Locale.ZH_CN && result.push(feedback())
+        return result
+    }
 
-    const footer = () => h('div', { class: 'option-container' }, [versionAndTotalInfo(), typeSelect(), mergeDomainSwitch(), link()])
+    const footer = () => h('div', { class: 'option-container' }, footerItems())
 
     return () => h('div',
         { style: `width:${width}; height:${height};` },

src/util/constant/url.ts

@@ -25,4 +25,11 @@ export const HOME_PAGE = homePage
 /**
  * @since 0.0.6
  */
-export const GITHUB_ISSUE_ADD = 'https://github.com/sheepzh/timer/issues/new'
+export const GITHUB_ISSUE_ADD = 'https://github.com/sheepzh/timer/issues/new'
+
+/**
+ * Feedback powered by www.wjx.cn
+ * 
+ * @since 0.1.6
+ */
+export const ZH_FEEDBACK_PAGE = 'https://www.wjx.cn/vj/YFWwHUy.aspx'

src/util/pattern.ts

@@ -4,7 +4,9 @@
  * @param url 
  */
 export function isBrowserUrl(url: string) {
-    return /^([(chrome)|(edge)].*?):\/\/.*$/g.test(url) || /^about(-.+)?:/.test(url)
+    return /^chrome.*?:\/\/.*$/.test(url)
+        || /^about(-.+)?:/.test(url)
+        || /^edge.*?:\/\/.*$/.test(url)
 }
 
 const isNotValidPort = (portStr: string) => {

test/util/pattern.test.ts

@@ -8,6 +8,7 @@ test('browser url', () => {
     expect(isBrowserUrl('about:addons')).toBeTruthy()
     // edge
     expect(isBrowserUrl('edge://extensions/')).toBeTruthy()
+    expect(isBrowserUrl('https://www.jss.com.cn/')).toBeFalsy()
 })
 
 test('ip and port', () => {