diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json index c9f366d..bb826fc 100644 --- a/src/_locales/de/messages.json +++ b/src/_locales/de/messages.json @@ -339,7 +339,7 @@ "close": { "message": "Schließen" }, - "useExtension": { + "useExtension": { "message": "Verwenden Sie die Erweiterung" }, "next": { @@ -407,25 +407,61 @@ "try": { "message": "Testen Sie" }, - "donate":{ + "donate": { "message": "Spende" }, - "enjoy":{ + "enjoy": { "message": "Haben Sie Spaß an Web Activity Time Tracker?" }, - "canDonate":{ + "canDonate": { "message": "Web Activity Time Tracker ist eine kostenlose Erweiterung. Sie können mich für die weitere Entwicklung mit Kryptowährung unterstützen." }, - "thanks":{ + "thanks": { "message": "Vielen Dank dafür! 🙏" }, - "coin":{ + "coin": { "message": "Münze" }, - "chain":{ + "chain": { "message": "Kette" }, - "address":{ + "address": { "message": "Adresse" + }, + "categoryUncategorized": { + "message": "Unkategorisiert" + }, + "categorySocialMedia": { + "message": "Soziale Medien" + }, + "categoryProductivity": { + "message": "Produktivität" + }, + "categoryEntertainment": { + "message": "Unterhaltung" + }, + "categoryNews": { + "message": "Nachrichten" + }, + "categoryShopping": { + "message": "Einkaufen" + }, + "categoryDevelopment": { + "message": "Entwicklung" + }, + "categoryEducation": { + "message": "Bildung" + }, + "categoryFinance": { + "message": "Finanzen" + }, + "categoryHealth": { + "message": "Gesundheit" + }, + "categoryGaming": { + "message": "Gaming" + }, + "categoryCommunication": { + "message": "Kommunikation" } -} \ No newline at end of file +} diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 216b4c1..21e9070 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -410,22 +410,58 @@ "donate": { "message": "Donate" }, - "enjoy":{ + "enjoy": { "message": "Do you enjoy Web Activity Time Tracker?" }, - "canDonate":{ + "canDonate": { "message": "Web Activity Time Tracker is free extension. You can support me for the further development with cryptocurrency." }, - "thanks":{ + "thanks": { "message": "Thank you! 🙏" }, - "coin":{ + "coin": { "message": "Coin" }, - "chain":{ + "chain": { "message": "Chain" }, - "address":{ + "address": { "message": "Address" + }, + "categoryUncategorized": { + "message": "Uncategorized" + }, + "categorySocialMedia": { + "message": "Social Media" + }, + "categoryProductivity": { + "message": "Productivity" + }, + "categoryEntertainment": { + "message": "Entertainment" + }, + "categoryNews": { + "message": "News" + }, + "categoryShopping": { + "message": "Shopping" + }, + "categoryDevelopment": { + "message": "Development" + }, + "categoryEducation": { + "message": "Education" + }, + "categoryFinance": { + "message": "Finance" + }, + "categoryHealth": { + "message": "Health" + }, + "categoryGaming": { + "message": "Gaming" + }, + "categoryCommunication": { + "message": "Communication" } } diff --git a/src/_locales/es/messages.json b/src/_locales/es/messages.json index c607eb2..b1f4c37 100644 --- a/src/_locales/es/messages.json +++ b/src/_locales/es/messages.json @@ -407,25 +407,61 @@ "try": { "message": "Pruebe" }, - "donate":{ + "donate": { "message": "Donación" }, - "enjoy":{ + "enjoy": { "message": "¿Te gusta Web Activity Time Tracker?" }, - "canDonate":{ + "canDonate": { "message": "Web Activity Time Tracker es una extensión gratuita. Usted me puede apoyar para el desarrollo futuro con cryptocurrency." }, - "thanks":{ + "thanks": { "message": "Muchas gracias! 🙏" }, - "coin":{ + "coin": { "message": "Moneda" }, - "chain":{ + "chain": { "message": "Cadena" }, - "address":{ + "address": { "message": "Dirección" + }, + "categoryUncategorized": { + "message": "Sin categoría" + }, + "categorySocialMedia": { + "message": "Redes Sociales" + }, + "categoryProductivity": { + "message": "Productividad" + }, + "categoryEntertainment": { + "message": "Entretenimiento" + }, + "categoryNews": { + "message": "Noticias" + }, + "categoryShopping": { + "message": "Compras" + }, + "categoryDevelopment": { + "message": "Desarrollo" + }, + "categoryEducation": { + "message": "Educación" + }, + "categoryFinance": { + "message": "Finanzas" + }, + "categoryHealth": { + "message": "Salud" + }, + "categoryGaming": { + "message": "Juegos" + }, + "categoryCommunication": { + "message": "Comunicación" } } diff --git a/src/_locales/ja/messages.json b/src/_locales/ja/messages.json index 86f408f..ae5b5c7 100644 --- a/src/_locales/ja/messages.json +++ b/src/_locales/ja/messages.json @@ -410,22 +410,58 @@ "donate": { "message": "寄付する" }, - "enjoy":{ + "enjoy": { "message": "Web Activity Time Trackerを楽しんでいますか？" }, - "canDonate":{ + "canDonate": { "message": "Web Activity Time Trackerは無料の拡張機能です。さらなる開発のために、暗号通貨でご支援ください。" }, - "thanks":{ + "thanks": { "message": "ありがとうございます！ 🙏" }, - "coin":{ + "coin": { "message": "コイン" }, - "chain":{ + "chain": { "message": "チェーン" }, - "address":{ + "address": { "message": "アドレス" + }, + "categoryUncategorized": { + "message": "未分類" + }, + "categorySocialMedia": { + "message": "ソーシャルメディア" + }, + "categoryProductivity": { + "message": "生産性" + }, + "categoryEntertainment": { + "message": "エンターテインメント" + }, + "categoryNews": { + "message": "ニュース" + }, + "categoryShopping": { + "message": "ショッピング" + }, + "categoryDevelopment": { + "message": "開発" + }, + "categoryEducation": { + "message": "教育" + }, + "categoryFinance": { + "message": "金融" + }, + "categoryHealth": { + "message": "健康" + }, + "categoryGaming": { + "message": "ゲーム" + }, + "categoryCommunication": { + "message": "コミュニケーション" } } diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json index 29768c3..9167433 100644 --- a/src/_locales/ru/messages.json +++ b/src/_locales/ru/messages.json @@ -408,25 +408,61 @@ "try": { "message": "Попробовать" }, - "donate":{ + "donate": { "message": "Donate" }, - "enjoy":{ + "enjoy": { "message": "Нравится ли вам Web Activity Time Tracker?" }, - "canDonate":{ + "canDonate": { "message": "Web Activity Time Tracker - это бесплатное расширение. Вы можете поддержать меня для дальнейшего развития с помощью криптовалюты." }, - "thanks":{ + "thanks": { "message": "Спасибо! 🙏" }, - "coin":{ + "coin": { "message": "Монета" }, - "chain":{ + "chain": { "message": "Цепочка" }, - "address":{ + "address": { "message": "Адрес" + }, + "categoryUncategorized": { + "message": "Без категории" + }, + "categorySocialMedia": { + "message": "Социальные сети" + }, + "categoryProductivity": { + "message": "Продуктивность" + }, + "categoryEntertainment": { + "message": "Развлечения" + }, + "categoryNews": { + "message": "Новости" + }, + "categoryShopping": { + "message": "Покупки" + }, + "categoryDevelopment": { + "message": "Разработка" + }, + "categoryEducation": { + "message": "Образование" + }, + "categoryFinance": { + "message": "Финансы" + }, + "categoryHealth": { + "message": "Здоровье" + }, + "categoryGaming": { + "message": "Игры" + }, + "categoryCommunication": { + "message": "Общение" } } diff --git a/src/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json index 673e348..8b604f8 100644 --- a/src/_locales/zh_CN/messages.json +++ b/src/_locales/zh_CN/messages.json @@ -407,25 +407,61 @@ "try": { "message": "试用" }, - "donate":{ + "donate": { "message": "捐赠" }, - "enjoy":{ + "enjoy": { "message": "您喜欢 Web Activity Time Tracker 吗" }, - "canDonate":{ + "canDonate": { "message": "Web Activity Time Tracker 是永久免费的扩展。您可以使用加密货币支持我进一步开发。" }, - "thanks":{ + "thanks": { "message": "谢谢！ 🙏" }, - "coin":{ + "coin": { "message": "币" }, - "chain":{ + "chain": { "message": "链" }, - "address":{ + "address": { "message": "币链地址" + }, + "categoryUncategorized": { + "message": "未分类" + }, + "categorySocialMedia": { + "message": "社交媒体" + }, + "categoryProductivity": { + "message": "生产力" + }, + "categoryEntertainment": { + "message": "娱乐" + }, + "categoryNews": { + "message": "新闻" + }, + "categoryShopping": { + "message": "购物" + }, + "categoryDevelopment": { + "message": "开发" + }, + "categoryEducation": { + "message": "教育" + }, + "categoryFinance": { + "message": "金融" + }, + "categoryHealth": { + "message": "健康" + }, + "categoryGaming": { + "message": "游戏" + }, + "categoryCommunication": { + "message": "通讯" } } diff --git a/src/components/BadgeIcons.vue b/src/components/BadgeIcons.vue index 16d920d..c456f58 100644 --- a/src/components/BadgeIcons.vue +++ b/src/components/BadgeIcons.vue @@ -2,6 +2,7 @@
{{ t('document.message') }} {{ t('limit.message') }} + {{ categoryLabel }}
@@ -14,7 +15,7 @@ export default { diff --git a/src/components/OverallStatistics.vue b/src/components/OverallStatistics.vue index e968f2b..3f37aa1 100644 --- a/src/components/OverallStatistics.vue +++ b/src/components/OverallStatistics.vue @@ -127,8 +127,8 @@ const mostActiveDayTime = computed(() => isIncludedCurrentForActiveDays.value ? convertSummaryTimeToString(props.data.mostActiveDay.summaryTime) : props.data.mostActiveDayExceptToday != null - ? convertSummaryTimeToString(props.data.mostActiveDayExceptToday.summaryTime) - : '-', + ? convertSummaryTimeToString(props.data.mostActiveDayExceptToday.summaryTime) + : '-', ); const mostInActiveDay = computed(() => @@ -141,8 +141,8 @@ const mostInActiveDayTime = computed(() => isIncludedCurrentForInActiveDays.value ? convertSummaryTimeToString(props.data.mostInactiveDay.summaryTime) : props.data.mostInactiveDayExceptToday != null - ? convertSummaryTimeToString(props.data.mostInactiveDayExceptToday.summaryTime) - : '-', + ? convertSummaryTimeToString(props.data.mostInactiveDayExceptToday.summaryTime) + : '-', ); function excludeTodayFromMostActive() { diff --git a/src/components/TabItem.vue b/src/components/TabItem.vue index a543f89..ea67ea8 100644 --- a/src/components/TabItem.vue +++ b/src/components/TabItem.vue @@ -9,7 +9,7 @@

{{ url }}

- +

day.date === todayLocalDate())!.counter : tab.counter, + category: tab.category, }; } diff --git a/src/dto/currentTabItem.ts b/src/dto/currentTabItem.ts index eeed770..93e44c5 100644 --- a/src/dto/currentTabItem.ts +++ b/src/dto/currentTabItem.ts @@ -1,6 +1,9 @@ +import { WebsiteCategory } from '../utils/enums'; + export interface CurrentTabItem { url: string; favicon: string | undefined; summaryTime: number; sessions: number; + category?: WebsiteCategory; } diff --git a/src/entity/tab.ts b/src/entity/tab.ts index bd674da..28f3b7d 100644 --- a/src/entity/tab.ts +++ b/src/entity/tab.ts @@ -1,5 +1,6 @@ import { todayLocalDate } from '../utils/date'; import { logger } from '../utils/logger'; +import { WebsiteCategory } from '../utils/enums'; export class Tab implements ISerializable { url: string = ''; @@ -7,11 +8,16 @@ export class Tab implements ISerializable { summaryTime: number = 0; counter: number = 0; days: TabDay[] = []; + category: WebsiteCategory = WebsiteCategory.Uncategorized; init(url: string) { this.url = url; } + setCategory(category: WebsiteCategory) { + this.category = category; + } + incSummaryTime(): void { this.summaryTime += 1; @@ -44,6 +50,7 @@ export class Tab implements ISerializable { this.counter = input.counter; this.favicon = input.favicon; this.summaryTime = input.summaryTime; + this.category = input.category ?? WebsiteCategory.Uncategorized; if (input.days?.length > 0) this.days = input.days.map(x => new TabDay().deserialize(x)); return this; diff --git a/src/functions/useWebUsageSummaryForDay.ts b/src/functions/useWebUsageSummaryForDay.ts index 242e0e6..659775e 100644 --- a/src/functions/useWebUsageSummaryForDay.ts +++ b/src/functions/useWebUsageSummaryForDay.ts @@ -24,8 +24,8 @@ export async function useWebUsageSummaryForDay(): Promise { dataToday == null ? '0%' : dataYesterday == null - ? '100%' - : `${getPercentage(dataToday.time, dataYesterday.time)}%`, + ? '100%' + : `${getPercentage(dataToday.time, dataYesterday.time)}%`, }; } diff --git a/src/repository/tabs-repository.ts b/src/repository/tabs-repository.ts index 740dd13..3258a40 100644 --- a/src/repository/tabs-repository.ts +++ b/src/repository/tabs-repository.ts @@ -4,6 +4,8 @@ import { injectStorage } from '../storage/inject-storage'; import { isInBlackList } from '../functions/black-list'; import { StorageDeserializeParam } from '../storage/storage-params'; import { todayLocalDate } from '../utils/date'; +import { classifyWebsite } from '../utils/website-classifier'; +import { WebsiteCategory } from '../utils/enums'; export class TabsRepository implements ITabsRepository { private tabs: Tab[]; @@ -14,6 +16,20 @@ export class TabsRepository implements ITabsRepository { async initAsync() { this.tabs = (await injectStorage().getDeserializeList(StorageDeserializeParam.TABS)) as Tab[]; + + // Classify existing tabs that don't have a category + let needsUpdate = false; + for (const tab of this.tabs) { + if (tab.category === undefined || tab.category === WebsiteCategory.Uncategorized) { + tab.setCategory(classifyWebsite(tab.url)); + needsUpdate = true; + } + } + + // If any tabs were classified, save the updated data + if (needsUpdate) { + await injectStorage().setList(StorageDeserializeParam.TABS, this.tabs); + } } getTabs(): Tab[] { @@ -39,6 +55,7 @@ export class TabsRepository implements ITabsRepository { if (!isInBlackListFlag && !tabFromStorage) { const newTab = new Tab(); newTab.init(domain); + newTab.setCategory(classifyWebsite(domain)); this.tabs.push(newTab); return newTab; } diff --git a/src/utils/enums.ts b/src/utils/enums.ts index 2ac1d3f..c6f1601 100644 --- a/src/utils/enums.ts +++ b/src/utils/enums.ts @@ -31,3 +31,18 @@ export enum TypeOfUrl { WebSite, Document, } + +export enum WebsiteCategory { + Uncategorized, + SocialMedia, + Productivity, + Entertainment, + News, + Shopping, + Development, + Education, + Finance, + Health, + Gaming, + Communication, +} diff --git a/src/utils/website-classifier.ts b/src/utils/website-classifier.ts new file mode 100644 index 0000000..a9c71cb --- /dev/null +++ b/src/utils/website-classifier.ts @@ -0,0 +1,255 @@ +import { WebsiteCategory } from './enums'; + +interface CategoryPattern { + category: WebsiteCategory; + patterns: string[]; +} + +const categoryPatterns: CategoryPattern[] = [ + { + category: WebsiteCategory.SocialMedia, + patterns: [ + 'facebook.com', + 'twitter.com', + 'x.com', + 'instagram.com', + 'linkedin.com', + 'reddit.com', + 'tiktok.com', + 'snapchat.com', + 'pinterest.com', + 'tumblr.com', + 'vk.com', + 'telegram.org', + 'discord.com', + 'mastodon.social', + 'mastodon.online', + 'threads.net', + ], + }, + { + category: WebsiteCategory.Productivity, + patterns: [ + 'notion.so', + 'evernote.com', + 'trello.com', + 'asana.com', + 'monday.com', + 'clickup.com', + 'todoist.com', + 'airtable.com', + 'miro.com', + 'figma.com', + 'canva.com', + 'google.com/drive', + 'docs.google.com', + 'sheets.google.com', + 'slides.google.com', + 'office.com', + 'office365.com', + ], + }, + { + category: WebsiteCategory.Entertainment, + patterns: [ + 'youtube.com', + 'netflix.com', + 'twitch.tv', + 'hulu.com', + 'disneyplus.com', + 'primevideo.com', + 'spotify.com', + 'soundcloud.com', + 'apple.com/music', + 'pandora.com', + 'deezer.com', + 'imdb.com', + 'rottentomatoes.com', + ], + }, + { + category: WebsiteCategory.News, + patterns: [ + 'news.google.com', + 'bbc.com', + 'cnn.com', + 'nytimes.com', + 'theguardian.com', + 'reuters.com', + 'apnews.com', + 'bloomberg.com', + 'wsj.com', + 'npr.org', + 'aljazeera.com', + 'washingtonpost.com', + 'forbes.com', + 'techcrunch.com', + 'theverge.com', + 'wired.com', + 'arstechnica.com', + ], + }, + { + category: WebsiteCategory.Shopping, + patterns: [ + 'amazon.com', + 'ebay.com', + 'etsy.com', + 'aliexpress.com', + 'walmart.com', + 'target.com', + 'bestbuy.com', + 'shopify.com', + 'zalando.com', + 'zalando.de', + 'zalando.fr', + 'asos.com', + 'alibaba.com', + ], + }, + { + category: WebsiteCategory.Development, + patterns: [ + 'github.com', + 'gitlab.com', + 'stackoverflow.com', + 'stackexchange.com', + 'developer.mozilla.org', + 'dev.to', + 'medium.com/@', + 'hashnode.com', + 'codepen.io', + 'jsfiddle.net', + 'codesandbox.io', + 'replit.com', + 'vercel.com', + 'netlify.com', + 'heroku.com', + 'digitalocean.com', + 'aws.amazon.com', + 'cloud.google.com', + 'azure.microsoft.com', + 'npmjs.com', + 'pypi.org', + ], + }, + { + category: WebsiteCategory.Education, + patterns: [ + 'coursera.org', + 'udemy.com', + 'edx.org', + 'khanacademy.org', + 'skillshare.com', + 'udacity.com', + 'pluralsight.com', + 'codecademy.com', + 'freecodecamp.org', + 'duolingo.com', + 'brilliant.org', + 'lynda.com', + 'wikipedia.org', + 'wikimedia.org', + ], + }, + { + category: WebsiteCategory.Finance, + patterns: [ + 'paypal.com', + 'stripe.com', + 'coinbase.com', + 'binance.com', + 'robinhood.com', + 'fidelity.com', + 'schwab.com', + 'vanguard.com', + 'mint.com', + 'credit-agricole', + 'bnpparibas', + 'societegenerale', + 'chase.com', + 'bankofamerica.com', + 'wellsfargo.com', + ], + }, + { + category: WebsiteCategory.Health, + patterns: [ + 'webmd.com', + 'mayoclinic.org', + 'healthline.com', + 'nih.gov', + 'cdc.gov', + 'who.int', + 'fitbit.com', + 'myfitnesspal.com', + 'strava.com', + ], + }, + { + category: WebsiteCategory.Gaming, + patterns: [ + 'steampowered.com', + 'store.steampowered.com', + 'epicgames.com', + 'itch.io', + 'gog.com', + 'origin.com', + 'battle.net', + 'nintendo.com', + 'playstation.com', + 'xbox.com', + 'roblox.com', + 'minecraft.net', + 'twitch.tv/directory/game', + ], + }, + { + category: WebsiteCategory.Communication, + patterns: [ + 'gmail.com', + 'outlook.com', + 'yahoo.com/mail', + 'protonmail.com', + 'slack.com', + 'teams.microsoft.com', + 'zoom.us', + 'meet.google.com', + 'skype.com', + 'whatsapp.com', + 'messenger.com', + ], + }, +]; + +/** + * Classifies a website URL into a category based on domain patterns + * @param url The URL to classify + * @returns The category of the website + */ +export function classifyWebsite(url: string): WebsiteCategory { + if (!url || typeof url !== 'string') { + return WebsiteCategory.Uncategorized; + } + + const lowerUrl = url.toLowerCase(); + + for (const { category, patterns } of categoryPatterns) { + for (const pattern of patterns) { + if (lowerUrl.includes(pattern)) { + return category; + } + } + } + + return WebsiteCategory.Uncategorized; +} + +/** + * Gets a human-readable name for a category + * @param category The category enum value + * @returns The category name as a string + */ +export function getCategoryName(category: WebsiteCategory): string { + return WebsiteCategory[category]; +}