Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/_locales/de/messages.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extName": {
"message": "Web Activity Time Tracker - Blockieren Sie Websites und Webanalysen"
"message": "Web Activity Time Tracker - Websites sperren, Pomodoro & Webanalyse"
},
"extDescription": {
"message": "Verfolgen und begrenzen Sie die Zeit Ihrer Webaktivitäten und blockieren Sie den Zugang zu den Websites. Überwachen Sie Ihre Internetnutzung."
Expand Down Expand Up @@ -361,7 +361,7 @@
},
"promoClearYoutube": {
"message": "Möchten Sie Kurzfilme, Kommentare, empfohlene Videos, Abonnements und andere YouTube-Ablenkungen blockieren? Wir haben eine weitere Erweiterung erstellt, mit der Sie YouTube ohne Ablenkung ansehen können.",
"description": "Install"
"description": "Versuchen Clean YouTube"
},
"completelyBlocked": {
"message": "Vollständig blockiert",
Expand Down
4 changes: 2 additions & 2 deletions src/_locales/en/messages.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extName": {
"message": "Web Activity Time Tracker - Block Sites, Web Analytics & Pomodoro"
"message": "Web Activity Time Tracker - Block Sites, Pomodoro & Web Analytics"
},
"extDescription": {
"message": "Track time of your web activity, limit and block distracting websites. Monitor your web usage."
Expand Down Expand Up @@ -263,7 +263,7 @@
},
"promoClearYoutube": {
"message": "Would you like to block shorts, comments, recommended videos, subscriptions, and other YouTube distractions? We've created another extension that will help you watch YouTube without distractions.",
"description": "Install"
"description": "Try Clean Youtube"
},
"block": {
"message": "You've reached your limit for today on "
Expand Down
4 changes: 2 additions & 2 deletions src/_locales/es/messages.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extName": {
"message": "Web Activity Time Tracker - Bloquear sitios, análisis web y Pomodoro"
"message": "Web Activity Time Tracker - Sitios bloqueados, Pomodoro y análisis web"
},
"extDescription": {
"message": "Controla el tiempo de tu actividad web, limita y bloquea los sitios web que te distraen. Monitoriza tu uso de la web."
Expand Down Expand Up @@ -263,7 +263,7 @@
},
"promoClearYoutube": {
"message": "¿Te gustaría bloquear los cortos, los comentarios, los vídeos recomendados, las suscripciones y otras distracciones de YouTube? Hemos creado otra extensión que te ayudará a ver YouTube sin distracciones.",
"description": "Instale"
"description": "Prueba Clean YouTube"
},
"block": {
"message": "Has alcanzado tu límite por hoy en"
Expand Down
4 changes: 2 additions & 2 deletions src/_locales/ru/messages.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extName": {
"message": "Web Activity Time Tracker - Блокировка сайтов и \u0412\u0435\u0431 аналитика"
"message": "Web Activity Time Tracker - Блокировка сайтов, Pomodoro и \u0412\u0435\u0431 аналитика"
},
"extDescription": {
"message": "Отслеживайте время вашей веб-активности и блокируйте отвлекающие сайты. Следите за тем, сколько времени вы проводите на сайтах."
Expand Down Expand Up @@ -288,7 +288,7 @@
},
"promoClearYoutube": {
"message": "Хотели бы вы блокировать шортсы, комментарии, рекомендованные видео, подписки и другие отвлекающие элементы YouTube? Мы создали еще одно расширение, которое поможет вам смотреть YouTube без отвлекающих факторов.",
"description": "Установить"
"description": "Попробовать Clean YouTube"
},
"removeAllData": {
"message": "Удалить все данные",
Expand Down
4 changes: 2 additions & 2 deletions src/_locales/zh_CN/messages.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"extName": {
"message": "Web Activity Time Tracker - 阻止网站、网络分析和番茄钟"
"message": "Web Activity Time Tracker - 封鎖網站、Pomodoro 與網頁分析"
},
"extDescription": {
"message": "追踪和限制您的网站活动时间,并阻止访问网站。监控您的网站使用情况"
Expand Down Expand Up @@ -361,7 +361,7 @@
},
"promoClearYoutube": {
"message": "您想屏蔽短片、评论、推荐视频、订阅和其他 YouTube 干扰内容吗? 我们创建了另一个扩展程序,可帮助您不受干扰地观看 YouTube",
"description": "安装"
"description": "嘗試 Clean YouTube"
},
"completelyBlocked": {
"message": "完全封锁",
Expand Down
3 changes: 1 addition & 2 deletions src/assets/css/dashboard.css
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,12 @@ body {
min-height: 300px;
cursor: pointer;
list-style: none;
padding: 10px;
padding-left: 10px;
max-height: 600px;
overflow: auto;
}

.url-list li {
line-height: 25px;
font-size: 14px;
}

Expand Down
48 changes: 24 additions & 24 deletions src/components/ListWithTime.vue
Original file line number Diff line number Diff line change
@@ -1,27 +1,5 @@
<template>
<ul readonly class="url-list">
<li v-for="(limit, i) of list" :key="i">
<div>
<img src="../assets/icons/delete.png" height="16" @click="deleteFromList(limit.domain)" />
<img
src="../assets/icons/edit.svg"
height="16"
@click="editItemFromList(limit.domain, limit.time)"
/>
<Favicon :type="TypeOfUrl.WebSite" :favicon="getFavicon(limit.domain)" />
<span>{{ limit.domain }}</span>
<div>
<p class="time-value d-inline-block" v-if="!completelyBlocked(limit.time)">
{{ t('limit.message') }} : {{ getTime(limit.time) }}
</p>
<p class="blocked" v-if="completelyBlocked(limit.time)">
{{ t('completelyBlocked.message') }}
</p>
</div>
</div>
</li>
</ul>
<div class="limits-time-block mt-20">
<div class="limits-time-block mb-20">
<input
type="text"
:disabled="isEdit"
Expand Down Expand Up @@ -50,6 +28,28 @@
<span>{{ t('completelyBlocked.description') }}</span>
</label>
</div>
<ul readonly class="url-list">
<li v-for="(limit, i) of list" :key="i">
<div>
<img src="../assets/icons/delete.png" height="16" @click="deleteFromList(limit.domain)" />
<img
src="../assets/icons/edit.svg"
height="16"
@click="editItemFromList(limit.domain, limit.time)"
/>
<Favicon :type="TypeOfUrl.WebSite" :favicon="getFavicon(limit.domain)" />
<span>{{ limit.domain }}</span>
<div>
<p class="time-value d-inline-block" v-if="!completelyBlocked(limit.time)">
{{ t('limit.message') }} : {{ getTime(limit.time) }}
</p>
<p class="blocked" v-if="completelyBlocked(limit.time)">
{{ t('completelyBlocked.message') }}
</p>
</div>
</div>
</li>
</ul>
</template>

<script lang="ts">
Expand Down Expand Up @@ -213,6 +213,6 @@ async function save(value: any) {
font-size: 13px;
color: gray;
margin-left: 55px;
margin-top: 5px;
margin-top: 0;
}
</style>
1 change: 0 additions & 1 deletion src/components/PromoClearYouTube.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,6 @@ async function saveValue() {
}
.review-block input[type='button'] {
float: right;
width: auto;
}
.review-block p {
display: inline-block;
Expand Down
2 changes: 1 addition & 1 deletion src/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"manifest_version": 3,
"name": "__MSG_extName__",
"short_name": "Web Tracker",
"version": "2.0.23",
"version": "2.0.24",
"description": "__MSG_extDescription__",
"options_page": "src/dashboard.html",
"default_locale": "en",
Expand Down
2 changes: 1 addition & 1 deletion src/welcome.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>Welcome to the Web Activity Time Tracker</title>
</head>

<body style="background: linear-gradient(to right, #ececff, #fff2f4)">
<body>
<script type="module" src="./welcome.ts"></script>
</body>
</html>