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: 4 additions & 0 deletions src/block.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
<div class="description">You've reached your limit today on <span id="site" class="current-site"></span></div>
<div class="description margin-top-10">Your current daily limit is <span id="limit" class="current-limit"></span></div>

<div class="description margin-top-10">You have already been here
<span id="deferredCount" class="deferred-metrics"></span> times for a total duration of
<span id="deferredTime" class="deferred-metrics"></span> today !
</div>
<div class="margin-top-10"><a id="deffererBtn" class="defferer-link">Set aside for 5 minutes</a></div>
</div>
<p class="product-title">Web Activity Time Tracker</p>
Expand Down
8 changes: 5 additions & 3 deletions src/scripts/background.js
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function backgroundCheck() {

function mainTRacker(activeUrl, tab, activeTab) {
if (activity.isLimitExceeded(activeUrl, tab) && !activity.wasDeferred(activeUrl)) {
setBlockPageToCurrent(activeTab.url);
setBlockPageToCurrent(activeTab.url, tab.days.at(-1).summary, tab.days.at(-1).counter);
}
if (!activity.isInBlackList(activeUrl)) {
if (activity.isNeedNotifyView(activeUrl, tab)) {
Expand Down Expand Up @@ -131,8 +131,10 @@ function notificationAction(activeUrl, tab) {
});
}

function setBlockPageToCurrent(currentUrl) {
var blockUrl = chrome.runtime.getURL("block.html") + '?url=' + currentUrl;
function setBlockPageToCurrent(currentUrl, summaryTime, counter) {
var blockUrl = chrome.runtime.getURL("block.html") + '?url=' + currentUrl
+ '&summaryTime=' + summaryTime
+ '&counter=' + counter;
chrome.tabs.query({ currentWindow: true, active: true }, function(tab) {
chrome.tabs.update(tab.id, { url: blockUrl });
});
Expand Down
6 changes: 6 additions & 0 deletions src/scripts/block.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,18 @@

var storage = new LocalStorage();
var blockSiteUrl;
var blockSiteTime;
var blockSiteCounter;
var restrictionList = [];

document.addEventListener("DOMContentLoaded", function () {
var url = new URL(document.URL);
blockSiteUrl = url.searchParams.get("url");
blockSiteTime = url.searchParams.get("summaryTime");
blockSiteCounter = url.searchParams.get("counter");
document.getElementById("site").innerText = extractHostname(blockSiteUrl);
document.getElementById("deferredTime").innerText = convertShortSummaryTimeToString(blockSiteTime);
document.getElementById("deferredCount").innerText = blockSiteCounter;

storage.getValue(STORAGE_RESTRICTION_LIST, function (items) {
restrictionList = items;
Expand Down
8 changes: 4 additions & 4 deletions src/scripts/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -444,14 +444,14 @@ function addDomainToEditableListBox(entity, elementId, actionEdit, actionDelete,
}

function deleteBlackSite(e) {
var targetElement = e.path[1];
var targetElement = e.composedPath()[1];
blackList.splice(blackList.indexOf(targetElement.innerText), 1);
document.getElementById('blackList').removeChild(targetElement);
updateBlackList();
}

function deleteRestrictionSite(e) {
var targetElement = e.path[1];
var targetElement = e.composedPath()[1];
var itemValue = targetElement.querySelector("[name='domain']").value;
var item = restrictionList.find(x => x.domain == itemValue);
restrictionList.splice(restrictionList.indexOf(item), 1);
Expand All @@ -460,7 +460,7 @@ function deleteRestrictionSite(e) {
}

function deleteNotificationSite(e) {
var targetElement = e.path[1];
var targetElement = e.composedPath()[1];
var itemValue = targetElement.querySelector("[name='domain']").value;
var item = notifyList.find(x => x.domain == itemValue);
notifyList.splice(notifyList.indexOf(item), 1);
Expand All @@ -469,7 +469,7 @@ function deleteNotificationSite(e) {
}

function actionEditSite(e, actionUpdateTimeFromList, actionUpdateList) {
var targetElement = e.path[1];
var targetElement = e.composedPath()[1];
var domainElement = targetElement.querySelector('[name="domain"]');
var timeElement = targetElement.querySelector('[name="time"]');
if (timeElement.classList.contains('clock-li-readonly')) {
Expand Down
6 changes: 6 additions & 0 deletions src/style/block.css
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,10 @@ body{
color: gray;
text-decoration: underline;
cursor: pointer;
}

.deferred-metrics{
font-weight: 500;
font-size: 1.2rem;
color: rgb(202, 48, 48);
}