diff --git a/package.json b/package.json index ab87e47..d2bbfa1 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,15 @@ { "name": "Mindful-Anti-Distraction", "version": "0.3.0", - "description": "Chrome extension to help curtail poor internet habits", - "repository": { - "type": "git", - "url": "https://github.com/qt31415926/mad" - }, - "private": true, + "description": "Chrome extension to help curtail poor internet habits", + "repository": { + "type": "git", + "url": "https://github.com/qt31415926/mad" + }, + "private": true, "devDependencies": { "grunt": "^0.4.5", "grunt-contrib-compress": "^0.13.0", - "grunt-crx": "^0.3.4", + "grunt-crx": "^1.0.3" } } diff --git a/src - 1.zip b/src - 1.zip new file mode 100644 index 0000000..bbd4e30 Binary files /dev/null and b/src - 1.zip differ diff --git a/src.zip b/src.zip new file mode 100644 index 0000000..ab79510 Binary files /dev/null and b/src.zip differ diff --git a/src/background.html b/src/background.html index 1a428fe..a0c6317 100644 --- a/src/background.html +++ b/src/background.html @@ -4,6 +4,7 @@ MAD + @@ -29,8 +30,9 @@

MAD: Mindful Anti Distraction

- - + + +
@@ -46,8 +48,8 @@
- - + +
@@ -130,30 +132,27 @@
-
- +
+
-
+
-
- +
+
- - Enter Site + Verify + Enter Site
-
-

HELP IM DISTRACTED

-
diff --git a/src/background.js b/src/background.js index 5d59437..ed42608 100644 --- a/src/background.js +++ b/src/background.js @@ -1,8 +1,38 @@ -var currTabs = []; //TODO add additional information to these objects, e.g. time +var currTabs = []; var updateInterval = 5; var cumulativeTime = 0; var totalTime = 0; +var settings = {}; + +var defaultSettings = { + "numOfPasses": 1, + "useReasonList": true +}; + +var updateSettings = function(){ + chrome.storage.sync.get('settings', function(items){ + if (items.settings == undefined){ + settings = defaultSettings; + } else { + settings = items.settings; + } + console.log(settings); + }); +}; +updateSettings(); + +var saveSettings = function(){ + chrome.storage.sync.set({'settings': settings}, function(){ + console.log('settings saved'); + }); +}; + +var deleteSettings = function(){ + chrome.storage.sync.remove('settings', function(){ + console.log('settings deleted'); + }); +}; function updateTimes(){ chrome.idle.queryState(60, function (state){ @@ -38,4 +68,4 @@ chrome.webRequest.onBeforeRequest.addListener( ["blocking"] ); -setInterval(updateTimes, updateInterval * 1000); +//setInterval(updateTimes, updateInterval * 1000); diff --git a/src/blocklist.html b/src/blocklist.html index 172cf96..33657a2 100644 --- a/src/blocklist.html +++ b/src/blocklist.html @@ -2,15 +2,7 @@ MAD Options - - - - - - - - +

BlockList

@@ -35,21 +27,25 @@

ASSIST FUTURE SELF

Simple Block

-
- -
-
- -
+
+
+ +
+
+ +
+

Exactsies Block

+
- +
+
+ + + + + + + + + + + + + + + + + +
+

Options

+

+
+

General

+
+
+
+ +
+
+
+
+
+
+
+ +
+ +
+

Show Reasons Feature

+
+ + diff --git a/src/popup.html b/src/popup.html index e41d1f5..3cb7087 100644 --- a/src/popup.html +++ b/src/popup.html @@ -19,10 +19,7 @@ diff --git a/src/reasons.html b/src/reasons.html index c5f1fc3..b70b63a 100644 --- a/src/reasons.html +++ b/src/reasons.html @@ -3,41 +3,58 @@ MAD Reasons - - - - - - - +
-

Reason Tracker

+

Reason Tracker: Increase Self Awareness

-
-

Good Reasons

-
-

Unsorted Reasons

-
-

{{ reason }}

-
+

Good

+
    +
    +

    {{reason.reason}}

    + +
    +
-
-

Poor Reasons

+ +
+

Unsorted

+
    +
    + +

    {{reason.reason}}

    + +
    +
+
+ +
+

Poor

+
+
+ +

{{reason.reason}}

+
+ +
- +
+