diff --git a/src/_locales/de/messages.json b/src/_locales/de/messages.json index c24c5d5..ad2140b 100644 --- a/src/_locales/de/messages.json +++ b/src/_locales/de/messages.json @@ -380,5 +380,35 @@ }, "darkTheme": { "message": "Dunkles Thema" + }, + "trackerJamPromo": { + "message": "Probieren Sie unsere neue App TrackerJam" + }, + "trackerJamPromo_description": { + "message": "Möchten Sie eine automatische Zeiterfassung mit Cloud-Speicher ausprobieren?" + }, + "trackerJamPromo_description2": { + "message": "TrackerJam ist eine Kombination aus einer Chrome-Erweiterung zur Analyse der Browser-Aktivitäten und einem Web-Dashboard zur Anzeige detaillierter Berichte." + }, + "trackerJamPromo_features": { + "message": "Unsere Funktionen:" + }, + "trackerJamPromo_features1": { + "message": "Cloud-Speicher" + }, + "trackerJamPromo_features2": { + "message": "Sie können mehrere Benutzer hinzufügen, um als Team zu arbeiten, oder den Tracker verwenden, um persönliche und berufliche Zeit getrennt zu analysieren" + }, + "trackerJamPromo_features3": { + "message": "Analyse der besuchten Seiten nach Kategorien, basierend auf KI und Produktivitätsmetriken" + }, + "trackerJamPromo_features4": { + "message": "Detaillierte Analysen zu jeder besuchten Seite innerhalb einer Website" + }, + "trackerJamPromo_features5": { + "message": "Anpassung der Arbeitszeiten" + }, + "try": { + "message": "Testen Sie" } } \ No newline at end of file diff --git a/src/_locales/en/messages.json b/src/_locales/en/messages.json index fb4a0d5..0e30126 100644 --- a/src/_locales/en/messages.json +++ b/src/_locales/en/messages.json @@ -380,5 +380,35 @@ }, "darkTheme": { "message": "Dark theme" + }, + "trackerJamPromo": { + "message": "Try our new app TrackerJam" + }, + "trackerJamPromo_description": { + "message": "Would like to try automatic time tracker with cloud storage?" + }, + "trackerJamPromo_description2": { + "message": "TrackerJam is a combination of a chrome extension to analyze browser activity and a web dashboard to see detailed reports." + }, + "trackerJamPromo_features": { + "message": "Our features:" + }, + "trackerJamPromo_features1": { + "message": "Cloud storage" + }, + "trackerJamPromo_features2": { + "message": "You can add multiple users to work as a team or use the tracker to analyze personal and work time separately" + }, + "trackerJamPromo_features3": { + "message": "Analyze visited sites by category based on AI and productivity metrics" + }, + "trackerJamPromo_features4": { + "message": "Detailed analytics on any visited web page within a web site" + }, + "trackerJamPromo_features5": { + "message": "Work time customization" + }, + "try": { + "message": "Try" } } diff --git a/src/_locales/es/messages.json b/src/_locales/es/messages.json index af1eaf3..375d87f 100644 --- a/src/_locales/es/messages.json +++ b/src/_locales/es/messages.json @@ -380,5 +380,35 @@ }, "darkTheme": { "message": "Tema oscuro" + }, + "trackerJamPromo": { + "message": "Pruebe nuestra nueva aplicación TrackerJam" + }, + "trackerJamPromo_description": { + "message": "¿Le gustaría probar el seguimiento automático del tiempo con almacenamiento en la nube?" + }, + "trackerJamPromo_description2": { + "message": "TrackerJam es una combinación de una extensión de Chrome para analizar la actividad del navegador y un panel web para ver informes detallados." + }, + "trackerJamPromo_features": { + "message": "Nuestras características:" + }, + "trackerJamPromo_features1": { + "message": "Almacenamiento en la nube" + }, + "trackerJamPromo_features2": { + "message": "Puedes añadir varios usuarios para trabajar en equipo o utilizar el rastreador para analizar el tiempo personal y laboral por separado" + }, + "trackerJamPromo_features3": { + "message": "Analiza los sitios visitados por categoría en función de la IA y las métricas de productividad" + }, + "trackerJamPromo_features4": { + "message": "Análisis detallados de cualquier página web visitada dentro de un sitio web" + }, + "trackerJamPromo_features5": { + "message": "Personalización del tiempo de trabajo" + }, + "try": { + "message": "Pruebe" } } diff --git a/src/_locales/ru/messages.json b/src/_locales/ru/messages.json index e007a9d..46b38e5 100644 --- a/src/_locales/ru/messages.json +++ b/src/_locales/ru/messages.json @@ -381,5 +381,35 @@ }, "darkTheme": { "message": "Темная тема" + }, + "trackerJamPromo": { + "message": "Попробуйте наше новое приложение TrackerJam" + }, + "trackerJamPromo_description": { + "message": "Хотите попробовать автоматический тайм-трекер с облачным хранилищем?" + }, + "trackerJamPromo_description2": { + "message": "TrackerJam - это сочетание расширения для хрома для анализа активности в браузере и веб-панели для просмотра подробных отчетов." + }, + "trackerJamPromo_features": { + "message": "Наши возможности:" + }, + "trackerJamPromo_features1": { + "message": "Облачное хранилище" + }, + "trackerJamPromo_features2": { + "message": "Вы можете добавить несколько пользователей для работы в команде или использовать трекер для анализа личного и рабочего времени по отдельности" + }, + "trackerJamPromo_features3": { + "message": "Анализ посещенных сайтов по категориям на основе показателей искусственного интеллекта и продуктивности" + }, + "trackerJamPromo_features4": { + "message": "Подробная аналитика по любой посещенной веб-странице внутри сайта" + }, + "trackerJamPromo_features5": { + "message": "Настройка рабочего времени" + }, + "try": { + "message": "Попробовать" } } diff --git a/src/_locales/zh_CN/messages.json b/src/_locales/zh_CN/messages.json index 3954350..b487bf6 100644 --- a/src/_locales/zh_CN/messages.json +++ b/src/_locales/zh_CN/messages.json @@ -380,5 +380,35 @@ }, "darkTheme": { "message": "黑暗主题" + }, + "trackerJamPromo": { + "message": "试试我们的新应用程序 TrackerJam" + }, + "trackerJamPromo_description": { + "message": "想试试带有云存储功能的自动时间跟踪器吗?" + }, + "trackerJamPromo_description2": { + "message": "TrackerJam 是一个 Chrome 浏览器扩展程序,用于分析浏览器活动,同时也是一个网络仪表盘,用于查看详细报告。" + }, + "trackerJamPromo_features": { + "message": "我们的特色" + }, + "trackerJamPromo_features1": { + "message": "云存储" + }, + "trackerJamPromo_features2": { + "message": "你可以添加多个用户作为一个团队工作,或使用跟踪器分别分析个人和工作时间" + }, + "trackerJamPromo_features3": { + "message": "根据人工智能和工作效率指标,按类别分析访问过的网站" + }, + "trackerJamPromo_features4": { + "message": "详细分析网站内任何访问过的网页" + }, + "trackerJamPromo_features5": { + "message": "自定义工作时间" + }, + "try": { + "message": "试用" } } diff --git a/src/assets/css/dark.css b/src/assets/css/dark.css index 0175901..87dffc6 100644 --- a/src/assets/css/dark.css +++ b/src/assets/css/dark.css @@ -71,4 +71,7 @@ } .dark .pomodoro-popup-block p{ color:#303030; +} +.dark .promo{ + color: black !important; } \ No newline at end of file diff --git a/src/assets/css/general.css b/src/assets/css/general.css index bac2baf..3ba9144 100644 --- a/src/assets/css/general.css +++ b/src/assets/css/general.css @@ -77,7 +77,7 @@ select { input[type='button'] { background: #428bff; color: #fff; - border-radius: 3px; + border-radius: 7px; height: 36px; line-height: 35px; padding: 0 20px; @@ -102,7 +102,7 @@ input[type='button'].alert { input[type='button'].info { background: #ffffff !important; color: black; - border: 1px solid black; + border: 1px solid rgb(151, 151, 151); } input[type='button'][disabled] { diff --git a/src/assets/trackerjam-promo.jpg b/src/assets/trackerjam-promo.jpg new file mode 100644 index 0000000..dd5f409 Binary files /dev/null and b/src/assets/trackerjam-promo.jpg differ diff --git a/src/background.ts b/src/background.ts index 582312b..88ffeb1 100644 --- a/src/background.ts +++ b/src/background.ts @@ -43,7 +43,7 @@ Browser.runtime.onInstalled.addListener(async details => { active: true, }); } - if (details.reason == 'update') { + if (details.reason == 'update' && !details.previousVersion) { const showChangelog = (await Settings.getInstance().getSetting( StorageParams.SHOW_CHANGELOG, )) as boolean; diff --git a/src/components/Dashboad.vue b/src/components/Dashboad.vue index 9658ff2..cf6503c 100644 --- a/src/components/Dashboad.vue +++ b/src/components/Dashboad.vue @@ -73,7 +73,7 @@ function openChart(type: TypeOfChart) { .chart-btn { background-color: rgb(192, 192, 192); color: #fff; - border-radius: 3px; + border-radius: 7px; height: 36px; line-height: 35px; padding: 0 20px; diff --git a/src/components/Pomodoro.vue b/src/components/Pomodoro.vue index 9f79eb0..be9a086 100644 --- a/src/components/Pomodoro.vue +++ b/src/components/Pomodoro.vue @@ -219,7 +219,7 @@ function playAudio(sound: PomodoroSounds) { button { border: none; color: #fff; - border-radius: 3px; + border-radius: 7px; height: 36px; line-height: 35px; padding: 0 20px; diff --git a/src/components/PromoTrackerJam.vue b/src/components/PromoTrackerJam.vue new file mode 100644 index 0000000..c72689a --- /dev/null +++ b/src/components/PromoTrackerJam.vue @@ -0,0 +1,98 @@ + + + + + diff --git a/src/manifest.json b/src/manifest.json index 208df38..23289d5 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.0.24", + "version": "2.1.0", "description": "__MSG_extDescription__", "options_page": "src/dashboard.html", "default_locale": "en", diff --git a/src/pages/Dashboard.vue b/src/pages/Dashboard.vue index 5b797d4..4d7cd9e 100644 --- a/src/pages/Dashboard.vue +++ b/src/pages/Dashboard.vue @@ -152,6 +152,8 @@ + + @@ -159,6 +161,7 @@ import { onMounted, ref, watch } from 'vue'; import { useI18n } from 'vue-i18n'; import GeneralSettings from '../components/GeneralSettings.vue'; +import PromoTrackerJam from '../components/PromoTrackerJam.vue'; import WhiteList from '../components/WhiteList.vue'; import Limits from '../components/Limits.vue'; import DailyNotifications from '../components/Notifications.vue'; diff --git a/src/storage/storage-params.ts b/src/storage/storage-params.ts index 09c001f..5683a71 100644 --- a/src/storage/storage-params.ts +++ b/src/storage/storage-params.ts @@ -29,6 +29,8 @@ export enum StorageParams { POMODORO_AUDIO_AFTER_FINISHED = 'pomodoro-audio-after-finished', POMODORO_INTERVAL_REST = 'pomodoro-interval-rest', POMODORO_FREQUENCY = 'pomodoro-frequency', + PROMO_TRACKERJAM_DATE = 'promo-trackerjam-date', + PROMO_TRACKERJAM_PROMPT_AT = 'promo-trackerjam-prompt-at', } export enum StorageDeserializeParam {