FEAT: manage site name (#34)

RECONSTRUCTURE: domain => host

Author: sheepzh

global.d.ts

@@ -5,7 +5,7 @@
  * @since 0.3.0
  */
 declare namespace Timer {
-    type SiteItem = 'total' | 'focus' | 'time'
+    type DataDimension = 'total' | 'focus' | 'time'
     /**
      * Options used for the popup page
      */
@@ -17,9 +17,9 @@ declare namespace Timer {
         /**
          * The default to display
          */
-        defaultType: SiteItem
+        defaultType: DataDimension
         /**
-         * Replace the domain name with site name which is detected automatically from the title of site homepages,
+         * Replace the host name with site name which is detected automatically from the title of site homepages,
          * or modified manually by the user
          * 
          * @since 0.4.1

jest.config.ts

@@ -1,4 +1,4 @@
-import type { Config } from '@jest/types'
+import type { Config } from "@jest/types"
 
 const config: Config.InitialOptions = {
   roots: [

public/popup.html

@@ -27,9 +27,9 @@
             </div>
           </div>
         </div>
-        <!-- merge domain -->
+        <!-- merge host -->
         <div
-          id="merge-domain-switch"
+          id="merge-host-switch"
           class="el-switch option-right"
           role="switch"
           style="margin-left: 10px"
@@ -169,7 +169,7 @@
     </div>
     <!-- Switch popup -->
     <div
-      id="merge-domain-popup-container"
+      id="merge-host-popup-container"
       class="el-popper is-dark"
       style="
         z-index: 2012;
@@ -180,7 +180,7 @@
         display: none;
       "
     >
-      <a id="merge-domain-popup-info">
+      <a id="merge-host-popup-info">
         <!-- 合并子域名 -->
       </a>
       <div

src/api/version.ts

@@ -5,8 +5,8 @@
  * https://opensource.org/licenses/MIT
  */
 
-import axios, { AxiosResponse } from 'axios'
-import { IS_CHROME, IS_EDGE, IS_FIREFOX } from '../util/constant/environment'
+import axios, { AxiosResponse } from "axios"
+import { IS_CHROME, IS_EDGE, IS_FIREFOX } from "../util/constant/environment"
 
 async function getFirefoxVersion(): Promise<string | null> {
     const response: AxiosResponse<any> = await axios.get('https://addons.mozilla.org/api/v3/addons/addon/2690100')

src/app/components/common/editable-tag.sass

@@ -24,18 +24,12 @@
     margin-bottom: 9px
     line-height: 32px !important
 
-.origin-domain-input
+.origin-host-input
     .el-input__inner
         border-bottom-right-radius: 0
         border-top-right-radius: 0
         border-right: 0
 
-.merged-domain-input
-    margin-right: 5px
-    .el-input__inner
-        border-bottom-left-radius: 0
-        border-top-left-radius: 0
-
 .el-alert
     margin-bottom: 20px
 

src/app/components/report/pagination.ts src/app/components/common/pagination.tssrc/app/components/report/pagination.ts renamed to src/app/components/common/pagination.ts

@@ -7,7 +7,7 @@
 
 import { ElPagination } from "element-plus"
 import { h, UnwrapRef } from "vue"
-import { PaginationInfo, QueryData } from "../common/constants"
+import { PaginationInfo, QueryData } from "./constants"
 
 export type PaginationProps = {
     queryData: QueryData

src/app/components/data-manage/clear/filter/operation-button.ts

@@ -8,7 +8,7 @@
 import { ElButton, ElMessage, ElMessageBox, ElTooltip } from "element-plus"
 import { Ref, h } from "vue"
 import TimerDatabase, { TimerCondition } from "../../../../../database/timer-database"
-import SiteInfo from "../../../../../entity/dto/site-info"
+import DataItem from "../../../../../entity/dto/data-item"
 import { ItemMessage } from "../../../../../util/i18n/components/item"
 import { t } from "../../../../locale"
 import { DataManageMessage } from "../../../../locale/components/data-manage"
@@ -30,7 +30,7 @@ type _Props = BaseFilterProps & {
 
     confirm: {
         message: keyof DataManageMessage
-        operation: (result: SiteInfo[]) => Promise<any>
+        operation: (result: DataItem[]) => Promise<any>
         resultMessage: keyof DataManageMessage
     }
 
@@ -103,7 +103,7 @@ const generateParamAndSelect = (props: _Props) => {
 }
 
 const handleClick = async (props: _Props) => {
-    const result: SiteInfo[] = await generateParamAndSelect(props)
+    const result: DataItem[] = await generateParamAndSelect(props)
 
     const count = result.length
     ElMessageBox.confirm(t(msg => msg.dataManage[props.confirm.message], { count }))

src/app/components/data-manage/clear/index.ts

@@ -9,7 +9,7 @@ import { ElAlert, ElCard } from "element-plus"
 import { h } from "vue"
 import { t } from "../../../locale"
 import { alertProps, bodyStyle } from "../common"
-import Filter from './filter'
+import Filter from "./filter"
 
 type _Props = {
     queryData: () => Promise<void> | void

src/app/components/data-manage/memory-info.ts

@@ -6,7 +6,7 @@
  */
 
 import { ElAlert, ElCard, ElProgress } from "element-plus"
-import { h, Ref } from 'vue'
+import { h, Ref } from "vue"
 import { t } from "../../locale"
 import { alertProps, bodyStyle } from "./common"
 

src/app/components/habit/chart/index.ts

@@ -5,9 +5,9 @@
  * https://opensource.org/licenses/MIT
  */
 
-import { ElCard } from 'element-plus'
-import { h, Ref } from 'vue'
-import { contentContainerCardStyle } from '../../common/content-container'
+import { ElCard } from "element-plus"
+import { h, Ref } from "vue"
+import { contentContainerCardStyle } from "../../common/content-container"
 
 export type ChartProps = {
     chartRef: Ref<HTMLDivElement>