Revert tracking chrome pages

Author: Stigmatoz

src/components/BadgeIcons.vue

@@ -1,7 +1,6 @@
 <template>
   <div class="d-inline-block">
     <span v-if="showDocumentBadge" class="badge-document">{{ t('document.message') }}</span>
-    <span v-if="showChromeBadge" class="badge-chrome">Chrome</span>
     <span v-if="showLimitBadge" class="badge-block">{{ t('limit.message') }}</span>
   </div>
 </template>
@@ -37,18 +36,9 @@ const showLimitBadge = computed(
     (props.listType == TypeOfList.Today || props.listType == TypeOfList.Dashboard) &&
     isLimit.value == true,
 );
-const showChromeBadge = computed(() => props.type == TypeOfUrl.Chrome);
 </script>
 
 <style scoped>
-span.badge-chrome {
-  border-radius: 6px;
-  background-color: #3aab58;
-  padding: 3px 7px;
-  font-size: 11px;
-  color: white;
-  font-weight: 600;
-}
 span.badge-document {
   border-radius: 6px;
   background-color: #0043ff9e;

src/components/TabItem.vue

@@ -47,12 +47,9 @@ const props = defineProps<{
   listType: TypeOfList;
 }>();
 
-const typeOfUrl = computed(() => {
-  if (props.item.url.startsWith('file:')) return TypeOfUrl.Document;
-  if (props.item.url.startsWith('chrome://') || props.item.url.startsWith('chrome-extension://'))
-    return TypeOfUrl.Chrome;
-  return TypeOfUrl.WebSite;
-});
+const typeOfUrl = computed(() =>
+  props.item.url.startsWith('file:') ? TypeOfUrl.Document : TypeOfUrl.WebSite,
+);
 
 const url = computed(() =>
   typeOfUrl.value == TypeOfUrl.Document

src/compositions/extract-hostname.ts

@@ -6,10 +6,6 @@ export function extractHostname(url: string | undefined): string {
     return url;
   }
 
-  if (url.startsWith('chrome://') || url.startsWith('chrome-extension://')) {
-    return url;
-  }
-
   if (url.indexOf('//') > -1) {
     hostname = url.split('/')[2];
   } else {

src/compositions/valid-page.ts

@@ -4,11 +4,11 @@ export function isValidPage(tab: Browser.Tabs.Tab | undefined): boolean {
   if (tab == null || tab == undefined || !tab.url || !tab.id) return false;
 
   if (
-    !tab.url.startsWith('http:') &&
-    !tab.url.startsWith('https:') &&
-    !tab.url.startsWith('file:') &&
-    !tab.url.startsWith('chrome://') &&
-    !tab.url.startsWith('chrome-extension://')
+    (!tab.url.startsWith('http:') &&
+      !tab.url.startsWith('https:') &&
+      !tab.url.startsWith('file:')) ||
+    tab.url.startsWith('chrome://') ||
+    tab.url.startsWith('chrome-extension://')
   )
     return false;
   return true;

src/tracker.ts

@@ -63,14 +63,18 @@ async function trackTime() {
           await mainTrackerWrapper(activeTab!, activeDomain, tab);
         }
       }
-    }
+    } else await closeOpenInterval();
   } else {
-    await closeInterval(activeTabInstance.getActiveTabDomain());
-    activeTabInstance.setActiveTab(null);
-    currentObj = null;
+    await closeOpenInterval();
   }
 }
 
+async function closeOpenInterval() {
+  await closeInterval(activeTabInstance.getActiveTabDomain());
+  activeTabInstance.setActiveTab(null);
+  currentObj = null;
+}
+
 async function mainTracker(
   state: Browser.Idle.IdleState,
   activeTab: Browser.Tabs.Tab,

src/utils/enums.ts

@@ -27,5 +27,4 @@ export enum ListWithTime {
 export enum TypeOfUrl {
   WebSite,
   Document,
-  Chrome,
 }