View block page when limit is exceeded

Stigmatoz · Stigmatoz · commit c749cbfa18db · 2019-04-07T01:09:51.000+03:00
diff --git a/block.html b/block.html
@@ -5,6 +5,7 @@
    <meta charset="utf-8">
    <title>Access to the site is limited</title>
    <link href="style/block.css" rel="stylesheet" />
+   <script src="scripts/block.js"></script>
 </head>
 
 <body>
diff --git a/scripts/background.js b/scripts/background.js
@@ -38,8 +38,8 @@ function backgroundCheck() {
                     activity.setCurrentActiveTab(tab.url);
                     chrome.idle.queryState(parseInt(setting_interval_inactivity), function (state) {
                         if (state === 'active') {
-                            if (activity.isLimitExceeded(activeUrl, tab)){
-                                chrome.tabs.create({ url: chrome.runtime.getURL("block.html") })
+                            if (activity.isLimitExceeded(activeUrl, tab)) {
+                                setBlockPageToCurrent(activeUrl);
                             }
                             if (!activity.isInBlackList(activeUrl))
                                 tab.incSummaryTime();
@@ -82,6 +82,13 @@ function backgroundCheck() {
     });
 }
 
+function setBlockPageToCurrent(activeUrl) {
+    var blockUrl = chrome.runtime.getURL("block.html") + '?url=' + activeUrl;
+    chrome.tabs.query({ currentWindow: true, active: true }, function (tab) {
+        chrome.tabs.update(tab.id, { url: blockUrl });
+    });
+}
+
 function backgroundUpdateStorage() {
     if (tabs != undefined && tabs.length > 0)
         storage.saveTabs(tabs);
diff --git a/scripts/block.js b/scripts/block.js
@@ -0,0 +1,5 @@
+document.addEventListener('DOMContentLoaded', function () {
+    var url = new URL(document.URL);
+    var blockSiteUrl = url.searchParams.get("url");
+    document.getElementById('site').innerText = blockSiteUrl;
+});
diff --git a/scripts/common.js b/scripts/common.js
@@ -58,7 +58,7 @@ function convertTimeToSummaryTime(time) {
     var min = timeValue[1];
     var resultTimeValue = 0;
     if (hour > 0)
-        resultTimeValue = hour * 60 * 3600;
+        resultTimeValue = hour * 3600;
     resultTimeValue += min * 60;
 
     return resultTimeValue;
diff --git a/style/block.css b/style/block.css
@@ -16,4 +16,5 @@ body{
 
 .current-site{
     font-weight: 500;
+    color: rgb(202, 48, 48);
 }
diff --git a/style/settings.css b/style/settings.css
@@ -318,6 +318,7 @@ input[type="button"]:hover {
 
 .restriction-item{
     width: 380px;
+    font-weight: 600;
 }
 
 .notify.warning{

Original file line number	Diff line number	Diff line change
`@@ -16,4 +16,5 @@ body{`
`16`	`16`
`17`	`17`	`.current-site{`
`18`	`18`	`font-weight: 500;`
	`19`	`+ color: rgb(202, 48, 48);`
`19`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -318,6 +318,7 @@ input[type="button"]:hover {`
`318`	`318`
`319`	`319`	`.restriction-item{`
`320`	`320`	`width: 380px;`
	`321`	`+ font-weight: 600;`
`321`	`322`	`}`
`322`	`323`
`323`	`324`	`.notify.warning{`