diff --git a/README.md b/README.md index acf1470..2304c08 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # 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.** ⚠️⚠️⚠️ + +**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) 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 fe12f7e..216b4c1 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -406,5 +406,26 @@ }, "try": { "message": "Try" + }, + "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": "币链地址" } } diff --git a/src/assets/css/dashboard.css b/src/assets/css/dashboard.css index b030f55..daaebce 100644 --- a/src/assets/css/dashboard.css +++ b/src/assets/css/dashboard.css @@ -275,7 +275,7 @@ label { padding: 5px 0 5px 20px; font-size: 16px; vertical-align: middle; - width: 270px; + width: 266px; height: 40px; display: table-cell; cursor: pointer; diff --git a/src/assets/css/general.css b/src/assets/css/general.css index 4f086a7..d15af6b 100644 --- a/src/assets/css/general.css +++ b/src/assets/css/general.css @@ -159,4 +159,10 @@ input[type='button'][disabled] { } .date-block .date-picker { width: 250px; +} +.font-bold{ + font-weight: 600; +} +.font-16{ + font-size: 16px; } \ No newline at end of file diff --git a/src/assets/icons/donate.png b/src/assets/icons/donate.png new file mode 100644 index 0000000..8f90408 Binary files /dev/null and b/src/assets/icons/donate.png differ diff --git a/src/assets/icons/donation-qr.png b/src/assets/icons/donation-qr.png new file mode 100644 index 0000000..06f400e Binary files /dev/null and b/src/assets/icons/donation-qr.png differ diff --git a/src/components/Donation.vue b/src/components/Donation.vue new file mode 100644 index 0000000..f3eed24 --- /dev/null +++ b/src/components/Donation.vue @@ -0,0 +1,46 @@ + + + + + + + diff --git a/src/manifest.json b/src/manifest.json index 59c5bd5..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.0", + "version": "2.2.2", "description": "__MSG_extDescription__", "options_page": "src/dashboard.html", "default_locale": "en", 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); } } 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/pages/Popup.vue b/src/pages/Popup.vue index 9ef2d63..51d8460 100644 --- a/src/pages/Popup.vue +++ b/src/pages/Popup.vue @@ -5,32 +5,34 @@

Web Activity Time Tracker

- - +
+ + - {{ t('pomodoroMode.message') }} - {{ t('dashboard.message') }} - {{ t('settings.message') }} + {{ t('pomodoroMode.message') }} + {{ t('dashboard.message') }} + {{ t('settings.message') }} +
@@ -139,7 +141,8 @@ function updateTab() { diff --git a/src/utils/enums.ts b/src/utils/enums.ts index bc270f2..2ac1d3f 100644 --- a/src/utils/enums.ts +++ b/src/utils/enums.ts @@ -19,6 +19,7 @@ export enum SettingsTab { Notifications, Pomodoro, About, + Donate, } export enum ListWithTime { diff --git a/src/utils/extension-tabs.ts b/src/utils/extension-tabs.ts index f89c8fe..005b335 100644 --- a/src/utils/extension-tabs.ts +++ b/src/utils/extension-tabs.ts @@ -10,6 +10,8 @@ export function getStringTab(tab: SettingsTab) { return 'settings'; case SettingsTab.About: return 'about'; + case SettingsTab.Donate: + return 'donation'; case SettingsTab.Limits: return 'limits'; case SettingsTab.WhiteList: @@ -39,5 +41,7 @@ export function getEnumValueTab(tab: string) { return SettingsTab.Notifications; case 'pomodoro': return SettingsTab.Pomodoro; + case 'donation': + return SettingsTab.Donate; } }