From 21503529e58b983781738bc58ff6185fca87b615 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 22 Oct 2024 18:18:24 +0300 Subject: [PATCH 01/15] Change color for dark mode --- src/assets/css/dark.css | 11 ++++++++++- src/assets/css/general.css | 4 ++-- src/components/Dashboad.vue | 2 +- src/components/MyApps.vue | 1 + src/components/TimeIntervalChart.vue | 18 ++++++++++++++---- src/manifest.json | 2 +- 6 files changed, 29 insertions(+), 9 deletions(-) diff --git a/src/assets/css/dark.css b/src/assets/css/dark.css index c6306f0..b976124 100644 --- a/src/assets/css/dark.css +++ b/src/assets/css/dark.css @@ -46,6 +46,9 @@ .dark .expander.total { background-color: #6f6f6f !important; } +.dark .url-list{ + border: 1px solid #494949 !important; +} .dark .header span{ color: rgb(255 255 255); } @@ -62,8 +65,14 @@ background-color: #303030 !important; border-left: 1px solid #494949 !important; } +.dark .app-block{ + background-color: #919191 !important; +} .dark .app-block .title{ - color: black; + color: rgb(255, 255, 255); +} +.dark .app-block .description{ + color: white !important; } .dark .settings-tab label[name="tabName"]:hover, .dark [type='radio']:checked ~ label{ background-color: #666666 !important; diff --git a/src/assets/css/general.css b/src/assets/css/general.css index 3ba9144..4f086a7 100644 --- a/src/assets/css/general.css +++ b/src/assets/css/general.css @@ -75,7 +75,7 @@ select { width: 100%; } input[type='button'] { - background: #428bff; + background: #5377af; color: #fff; border-radius: 7px; height: 36px; @@ -91,7 +91,7 @@ input[type='button'] { } input[type='button']:hover { - background: #5c9dfe; + background: #314158; text-decoration: none; } diff --git a/src/components/Dashboad.vue b/src/components/Dashboad.vue index cf6503c..b386e74 100644 --- a/src/components/Dashboad.vue +++ b/src/components/Dashboad.vue @@ -87,7 +87,7 @@ function openChart(type: TypeOfChart) { } .chart-btn.active { - background-color: #428bff !important; + background-color: #5377af !important; color: white; } diff --git a/src/components/MyApps.vue b/src/components/MyApps.vue index 3472da6..28da6ea 100644 --- a/src/components/MyApps.vue +++ b/src/components/MyApps.vue @@ -70,6 +70,7 @@ function openAppLink(app: App) { .description { margin-top: 10px; font-size: 14px; + color: black; } img { margin: auto; diff --git a/src/components/TimeIntervalChart.vue b/src/components/TimeIntervalChart.vue index 1286b71..f10c3ed 100644 --- a/src/components/TimeIntervalChart.vue +++ b/src/components/TimeIntervalChart.vue @@ -23,7 +23,11 @@ export default { + + + + diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue index 6a53569..27362cb 100644 --- a/src/pages/Dashboard.vue +++ b/src/pages/Dashboard.vue @@ -153,6 +153,25 @@ +
+ + + +
+
+ +
+
+
+ @@ -174,6 +193,7 @@ import { getEnumValueTab } from '../utils/extension-tabs'; import { applyDarkMode } from '../utils/dark-mode'; import { injectStorage } from '../storage/inject-storage'; import { StorageParams, DARK_MODE_DEFAULT } from '../storage/storage-params'; +import Donation from '../components/Donation.vue'; const { t } = useI18n(); const extensionPage = useExtensionPage(); @@ -233,7 +253,6 @@ function selectTab(value: SettingsTab) { font-weight: 600; font-size: 15px; } - .header-block .logo { margin: 10px 10px 10px 15px; } @@ -246,4 +265,8 @@ function selectTab(value: SettingsTab) { position: fixed; bottom: 20px; } +.donate { + position: fixed; + bottom: 75px; +} diff --git a/src/utils/extension-tabs.ts b/src/utils/extension-tabs.ts index 29177e1..005b335 100644 --- a/src/utils/extension-tabs.ts +++ b/src/utils/extension-tabs.ts @@ -41,5 +41,7 @@ export function getEnumValueTab(tab: string) { return SettingsTab.Notifications; case 'pomodoro': return SettingsTab.Pomodoro; + case 'donation': + return SettingsTab.Donate; } } From 4def7ee15e34edd6dee67c34be8a84c802ce0b5a Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 18 Jan 2025 20:35:43 +0300 Subject: [PATCH 10/15] Locales --- src/_locales/de/messages.json | 21 +++++++++++++++++++++ src/_locales/en/messages.json | 18 ++++++++++++++++++ src/_locales/es/messages.json | 21 +++++++++++++++++++++ src/_locales/ja/messages.json | 21 +++++++++++++++++++++ src/_locales/ru/messages.json | 21 +++++++++++++++++++++ src/_locales/zh_CN/messages.json | 21 +++++++++++++++++++++ 6 files changed, 123 insertions(+) diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json index 4d99e0c..c9f366d 100644 --- a/src/_locales/de/messages.json +++ b/src/_locales/de/messages.json @@ -406,5 +406,26 @@ }, "try": { "message": "Testen Sie" + }, + "donate":{ + "message": "Spende" + }, + "enjoy":{ + "message": "Haben Sie Spaß an Web Activity Time Tracker?" + }, + "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":{ + "message": "Vielen Dank dafür! 🙏" + }, + "coin":{ + "message": "Münze" + }, + "chain":{ + "message": "Kette" + }, + "address":{ + "message": "Adresse" } } \ No newline at end of file diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index 976957d..216b4c1 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -409,5 +409,23 @@ }, "donate": { "message": "Donate" + }, + "enjoy":{ + "message": "Do you enjoy Web Activity Time Tracker?" + }, + "canDonate":{ + "message": "Web Activity Time Tracker is free extension. You can support me for the further development with cryptocurrency." + }, + "thanks":{ + "message": "Thank you! 🙏" + }, + "coin":{ + "message": "Coin" + }, + "chain":{ + "message": "Chain" + }, + "address":{ + "message": "Address" } } diff --git a/src/_locales/es/messages.json b/src/_locales/es/messages.json index e7fe7c5..c607eb2 100644 --- a/src/_locales/es/messages.json +++ b/src/_locales/es/messages.json @@ -406,5 +406,26 @@ }, "try": { "message": "Pruebe" + }, + "donate":{ + "message": "Donación" + }, + "enjoy":{ + "message": "¿Te gusta Web Activity Time Tracker?" + }, + "canDonate":{ + "message": "Web Activity Time Tracker es una extensión gratuita. Usted me puede apoyar para el desarrollo futuro con cryptocurrency." + }, + "thanks":{ + "message": "Muchas gracias! 🙏" + }, + "coin":{ + "message": "Moneda" + }, + "chain":{ + "message": "Cadena" + }, + "address":{ + "message": "Dirección" } } diff --git a/src/_locales/ja/messages.json b/src/_locales/ja/messages.json index 813a064..86f408f 100644 --- a/src/_locales/ja/messages.json +++ b/src/_locales/ja/messages.json @@ -406,5 +406,26 @@ }, "try": { "message": "トライ" + }, + "donate": { + "message": "寄付する" + }, + "enjoy":{ + "message": "Web Activity Time Trackerを楽しんでいますか？" + }, + "canDonate":{ + "message": "Web Activity Time Trackerは無料の拡張機能です。さらなる開発のために、暗号通貨でご支援ください。" + }, + "thanks":{ + "message": "ありがとうございます！ 🙏" + }, + "coin":{ + "message": "コイン" + }, + "chain":{ + "message": "チェーン" + }, + "address":{ + "message": "アドレス" } } diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json index 432def6..29768c3 100644 --- a/src/_locales/ru/messages.json +++ b/src/_locales/ru/messages.json @@ -407,5 +407,26 @@ }, "try": { "message": "Попробовать" + }, + "donate":{ + "message": "Donate" + }, + "enjoy":{ + "message": "Нравится ли вам Web Activity Time Tracker?" + }, + "canDonate":{ + "message": "Web Activity Time Tracker - это бесплатное расширение. Вы можете поддержать меня для дальнейшего развития с помощью криптовалюты." + }, + "thanks":{ + "message": "Спасибо! 🙏" + }, + "coin":{ + "message": "Монета" + }, + "chain":{ + "message": "Цепочка" + }, + "address":{ + "message": "Адрес" } } diff --git a/src/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json index f8135f2..673e348 100644 --- a/src/_locales/zh_CN/messages.json +++ b/src/_locales/zh_CN/messages.json @@ -406,5 +406,26 @@ }, "try": { "message": "试用" + }, + "donate":{ + "message": "捐赠" + }, + "enjoy":{ + "message": "您喜欢 Web Activity Time Tracker 吗" + }, + "canDonate":{ + "message": "Web Activity Time Tracker 是永久免费的扩展。您可以使用加密货币支持我进一步开发。" + }, + "thanks":{ + "message": "谢谢！ 🙏" + }, + "coin":{ + "message": "币" + }, + "chain":{ + "message": "链" + }, + "address":{ + "message": "币链地址" } } From 20793845555665249698bfc44c9ffe19afe9d43a Mon Sep 17 00:00:00 2001 From: Alex Date: Sat, 18 Jan 2025 20:39:35 +0300 Subject: [PATCH 11/15] Bump version to 2.2.1 --- src/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/manifest.json b/src/manifest.json index 59c5bd5..f60fa0a 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 3, "name": "__MSG_extName__", "short_name": "Web Tracker", - "version": "2.2.0", + "version": "2.2.1", "description": "__MSG_extDescription__", "options_page": "src/dashboard.html", "default_locale": "en", From 78d1b303980c0432a3cb1f6f83d6d55e20e5dc5a Mon Sep 17 00:00:00 2001 From: Piyush Duggal <63952890+PiyushDuggal-source@users.noreply.github.com> Date: Thu, 6 Feb 2025 13:17:48 -0800 Subject: [PATCH 12/15] change block page url open from new tab to current (#151) --- src/pages/Block.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Block.vue b/src/pages/Block.vue index e0d3779..4355405 100644 --- a/src/pages/Block.vue +++ b/src/pages/Block.vue @@ -81,7 +81,7 @@ async function deferring() { haveToShowDeffering.value ) { await defering(webSite.value, 5); - if (sourceUrl.value != '') window.open(sourceUrl.value); + if (sourceUrl.value != '') window.location.replace(sourceUrl.value); } } From e0e62465e9274d4dd34169e62d1acfba30f02114 Mon Sep 17 00:00:00 2001 From: Alex Date: Fri, 7 Feb 2025 00:21:54 +0300 Subject: [PATCH 13/15] Remove donate button from popup --- src/manifest.json | 2 +- src/pages/Popup.vue | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/manifest.json b/src/manifest.json index f60fa0a..64b8888 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 3, "name": "__MSG_extName__", "short_name": "Web Tracker", - "version": "2.2.1", + "version": "2.2.2", "description": "__MSG_extDescription__", "options_page": "src/dashboard.html", "default_locale": "en", diff --git a/src/pages/Popup.vue b/src/pages/Popup.vue index d5eef5c..51d8460 100644 --- a/src/pages/Popup.vue +++ b/src/pages/Popup.vue @@ -33,10 +33,6 @@ >{{ t('settings.message') }} - {{ t('donate.message') - }}
From 5b534dbc09674b9d0387e290bfaf3d0f20b36a95 Mon Sep 17 00:00:00 2001 From: Alex Khrisanfov Date: Tue, 25 Mar 2025 22:26:18 +0300 Subject: [PATCH 14/15] Update README.md (#157) --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index acf1470..8e3500a 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,7 @@ # Web Activity Time Tracker Add to Chrome +⚠️⚠️⚠️ **Important notice! The Chrome extension has been sold. So I am not responsible for any changes to the functionality of the extension.** ⚠️⚠️⚠️ + [![Chrome Web Store](https://img.shields.io/chrome-web-store/d/hhfnghjdeddcfegfekjeihfmbjenlomm.svg?&label=Chrome%20users&ogo=google-chrome&logoColor=white)](https://chrome.google.com/webstore/detail/web-activity-time-tracker/hhfnghjdeddcfegfekjeihfmbjenlomm) [![Chrome Web Store](https://img.shields.io/chrome-web-store/rating/hhfnghjdeddcfegfekjeihfmbjenlomm?&logoColor=white;label=Rating)](https://chrome.google.com/webstore/detail/web-activity-time-tracker/hhfnghjdeddcfegfekjeihfmbjenlomm) [![Chrome Web Store](https://img.shields.io/chrome-web-store/v/hhfnghjdeddcfegfekjeihfmbjenlomm.svg?&logo=google-chrome&logoColor=white)](https://chrome.google.com/webstore/detail/web-activity-time-tracker/hhfnghjdeddcfegfekjeihfmbjenlomm) From 5154b83f4143885270072d73abd50a3758396400 Mon Sep 17 00:00:00 2001 From: Alex Khrisanfov Date: Thu, 29 May 2025 14:34:30 +0300 Subject: [PATCH 15/15] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 8e3500a..2304c08 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ ⚠️⚠️⚠️ **Important notice! The Chrome extension has been sold. So I am not responsible for any changes to the functionality of the extension.** ⚠️⚠️⚠️ +**The new version is available on the Chrome Store https://chromewebstore.google.com/detail/timespy-block-websites-po/ggomgkmpcnmfhgmpfaphkbmnokllflom** + [![Chrome Web Store](https://img.shields.io/chrome-web-store/d/hhfnghjdeddcfegfekjeihfmbjenlomm.svg?&label=Chrome%20users&ogo=google-chrome&logoColor=white)](https://chrome.google.com/webstore/detail/web-activity-time-tracker/hhfnghjdeddcfegfekjeihfmbjenlomm) [![Chrome Web Store](https://img.shields.io/chrome-web-store/rating/hhfnghjdeddcfegfekjeihfmbjenlomm?&logoColor=white;label=Rating)](https://chrome.google.com/webstore/detail/web-activity-time-tracker/hhfnghjdeddcfegfekjeihfmbjenlomm) [![Chrome Web Store](https://img.shields.io/chrome-web-store/v/hhfnghjdeddcfegfekjeihfmbjenlomm.svg?&logo=google-chrome&logoColor=white)](https://chrome.google.com/webstore/detail/web-activity-time-tracker/hhfnghjdeddcfegfekjeihfmbjenlomm)