Refact utils

Author: Stigmatoz

src/compositions/daily-intervals.ts

@@ -1,7 +1,7 @@
 import { TimeInterval } from "../entity/time-interval";
 import { injecStorage } from "../storage/inject-storage";
 import { StorageDeserializeParam, StorageParams } from "../storage/storage-params";
-import { todayLocalDate } from "../utils/common";
+import { todayLocalDate } from "../utils/today";
 
 export async function closeInterval(domain:string | null): Promise<void>{
     if (domain == null) return;

src/compositions/limit-list.ts

@@ -2,7 +2,7 @@ import { Restriction } from "../entity/restriction";
 import { Tab } from "../entity/tab";
 import { injecStorage } from "../storage/inject-storage";
 import { StorageParams } from "../storage/storage-params";
-import { todayLocalDate } from "../utils/common";
+import { todayLocalDate } from "../utils/today";
 
 export async function isLimitExceeded(url: string, tab: Tab): Promise<boolean>{
     const storage = injecStorage();

src/entity/restriction.ts

@@ -1,10 +1,10 @@
-import { convertStringTimeToSummaryTime } from "../common/utility";
+import { convertStringTimeToSummaryTime } from "../utils/converter";
 
 export class Restriction {
     domain: string;
     time: number;
 
-    constructor(domain: string, time: string){
+    constructor(domain: string, time: string) {
         this.domain = domain;
         this.time = convertStringTimeToSummaryTime(time);
     }

src/entity/tab.ts

@@ -1,4 +1,4 @@
-import { todayLocalDate } from "../utils/common";
+import { todayLocalDate } from "../utils/today";
 import { logger } from "../compositions/logger";
 
 export class Tab implements ISerializable<Tab> {

src/tracker.ts

@@ -12,7 +12,7 @@ import { ActiveTab } from "./compositions/activeTab";
 import { isLimitExceeded } from "./compositions/limit-list";
 import { Tab } from "./entity/tab";
 import { useBlockPage } from "./compositions/block-page";
-import { convertSummaryTimeToBadgeString } from "./common/utility";
+import { convertSummaryTimeToBadgeString } from "./utils/converter";
 
 const activeTabInstance = ActiveTab.getInstance();
 const storage = injecStorage();

src/utils/common.ts

@@ -1,3 +1,8 @@
-export function todayLocalDate(){
-    return new Date().toLocaleDateString('en-US');
+export function isEmpty(obj: any): boolean {
+    for (const prop in obj) {
+        if (obj.hasOwnProperty(prop))
+            return false;
+    }
+
+    return JSON.stringify(obj) === JSON.stringify({});
 }

src/common/utility.ts src/utils/converter.tssrc/common/utility.ts renamed to src/utils/converter.ts

@@ -1,13 +1,4 @@
-export function isEmpty(obj:any): boolean {
-    for (const prop in obj) {
-        if (obj.hasOwnProperty(prop))
-            return false;
-    }
-
-    return JSON.stringify(obj) === JSON.stringify({});
-}
-
-export function convertStringTimeToSummaryTime(time:string) {
+export function convertStringTimeToSummaryTime(time: string) {
     const timeValue = time.split(':');
     const hour = Number(timeValue[0]);
     const min = Number(timeValue[1]);
@@ -19,7 +10,7 @@ export function convertStringTimeToSummaryTime(time:string) {
     return resultTimeValue;
 }
 
-export function convertSummaryTimeToBadgeString(summaryTime:number):string {
+export function convertSummaryTimeToBadgeString(summaryTime: number): string {
     const sec = summaryTime;
     const min = Number((summaryTime / 60).toFixed(0));
     const hours = Number((summaryTime / (60 * 60)).toFixed(1));

src/utils/today.ts

@@ -0,0 +1,3 @@
+export function todayLocalDate() {
+    return new Date().toLocaleDateString('en-US');
+}