Clean up files

SherryH · Mar 9, 2017 · 13939ab · 13939ab
1 parent b0d8263
commit 13939ab
Show file tree

Hide file tree

Showing 6 changed files with 2 additions and 67 deletions.
diff --git a/client/src/components/Dashboard.js b/client/src/components/Dashboard.js
@@ -54,6 +54,7 @@ export default class Dashboard extends React.Component {
     });
     this.getAllGoals();
     this.getBlacklist();
+    this.getExtensionData();
     this.callCustomJQuery();
   }
 

diff --git a/extension/background.js b/extension/background.js
@@ -3,14 +3,9 @@
 //Check edge cases
 
 //Clearing data
-//Clear data every 24 hours at midnight
-//chrome.alarms.create("midnightClearStats", {when: new Date().setHours(0), periodInMinutes: 1440});
 //Clear all notifications every 24 hours at midnight
 chrome.alarms.create("clearNotifications", {when: new Date().setHours(0), periodInMinutes: 1440});
 
-//For testing:
-//chrome.alarms.create("clearNotifications", {periodInMinutes: 1});
-
 //Send information to app every half hour
 chrome.alarms.create("updateApp", {periodInMinutes: 30});
 
@@ -30,11 +25,6 @@ chrome.alarms.onAlarm.addListener(function(alarm) {
     console.log('update warn time');
     localStorage.warn = JSON.stringify(warn);
   }
-  // if (alarm.name === "midnightClearStats") {
-  //   console.log('now clearing stats');
-  //   var oldSites = new Sites(config);
-  //   oldSites.clear();
-  // }
 });
 
 function sendAppStats() {

diff --git a/extension/content.js b/extension/content.js
diff --git a/extension/ic_close.png b/extension/ic_close.png
diff --git a/extension/options.js b/extension/options.js
@@ -79,7 +79,6 @@ function updateBlacklist(){
         }
       });
       console.log('blacklist', blacklist);
-      //localStorage.blacklist = JSON.stringify(data.data);
       // Store all sites to blackout inside localStorage.blackout
       // Store all sites to block after certain time inside localStorage.block
       // Store all sites to warn after certain time inside localStorage.warn

diff --git a/extension/popup.js b/extension/popup.js
@@ -91,7 +91,7 @@ function addLocalDisplay() {
    row = document.createElement("tr");
    cell = document.createElement("td");
    var removeImage = document.createElement("img");
-   removeImage.src = chrome.extension.getURL("images/remove.png");
+   removeImage.src = chrome.extension.getURL("ic_close.png");
    removeImage.title = "Remove and stop tracking.";
    removeImage.width = 10;
    removeImage.height = 10;