From e971a56557f5f2982eb4e5bcf07a3200096b326a Mon Sep 17 00:00:00 2001 From: qt31415926 Date: Sun, 12 Apr 2015 08:08:42 -0400 Subject: [PATCH] major changes, moving around files, customizations added --- README.md | 5 + background.html | 91 +++++++++++++++---- background.js | 12 +-- conf.js | 5 + css/angular-csp.css | 13 +++ css/main.css | 21 +++++ img/add.png | Bin 0 -> 452 bytes img/default/happy0.png | Bin 0 -> 11566 bytes img/default/happy1.png | Bin 0 -> 10134 bytes img/default/happy2.png | Bin 0 -> 9494 bytes img/default/happy3.png | Bin 0 -> 8443 bytes img/default/happy4.png | Bin 0 -> 7986 bytes img/default/happygrey.png | Bin 0 -> 8484 bytes js/altController.js | 23 ----- js/app.js | 41 ++++++++- js/checkerino.js | 131 ++++++++++++++++++++++----- js/controllers/altController.js | 64 +++++++++++++ js/controllers/headerController.js | 103 +++++++++++++++++++++ js/controllers/popupController.js | 23 +++++ js/popup.js | 18 ++-- js/shared/angular-file-upload.min.js | 2 + js/{ => shared}/angular.min.js | 0 js/shared/angular.min.js.map | 8 ++ js/{ => shared}/bootstrap.min.js | 0 js/{ => shared}/jquery.min.js | 0 js/shared/ui-bootstrap.min.js | 10 ++ js/verify.js | 6 +- manifest.json | 8 +- options.html | 81 +++++++++++++---- popup.html | 23 +++-- test/mad-spec.js | 7 ++ 31 files changed, 577 insertions(+), 118 deletions(-) create mode 100644 conf.js create mode 100644 css/angular-csp.css create mode 100644 img/add.png create mode 100644 img/default/happy0.png create mode 100644 img/default/happy1.png create mode 100644 img/default/happy2.png create mode 100644 img/default/happy3.png create mode 100644 img/default/happy4.png create mode 100644 img/default/happygrey.png delete mode 100644 js/altController.js create mode 100644 js/controllers/altController.js create mode 100644 js/controllers/headerController.js create mode 100644 js/controllers/popupController.js create mode 100644 js/shared/angular-file-upload.min.js rename js/{ => shared}/angular.min.js (100%) create mode 100644 js/shared/angular.min.js.map rename js/{ => shared}/bootstrap.min.js (100%) rename js/{ => shared}/jquery.min.js (100%) create mode 100644 js/shared/ui-bootstrap.min.js create mode 100644 test/mad-spec.js diff --git a/README.md b/README.md index 22bae53..45bb515 100644 --- a/README.md +++ b/README.md @@ -38,3 +38,8 @@ v0.1.0.3 30/03/2015 v0.1.0.5 02/04/2015 - Fought around with AJAX functions. They're whack. Was too stubborn on trying to find a way to return a value from an async call. In the end, I should not fight with callback functions, just use em and reorganize my code so it's not like how you normally code in Java/C++, - Moving on to user customization now. Lots of things to consider. Should I use angular for 1-pagey-ness functionality? Tough questions. I think I'll try. + +v0.2.0.0 10/04/2015 +- Learnt AngularJS to implement some one-page functionality goodness. It's SO COOOOOOL. Enjoying the simplicity of the MVC framework and how seamless and speedy things run. +- Ran into more asynchronous problems, although this time I fixed them rather quickly now that I have more experience. Just gotta get used to that asynchronous thinkin ya feeeeel. +- I keep on thinking of more and more things to do or add. I'm going to have to speed up the rate in which I complete things, or else I'm going to get squashed. diff --git a/background.html b/background.html index 59b4aaa..7fbc33e 100644 --- a/background.html +++ b/background.html @@ -2,37 +2,92 @@ MAD - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + -
+

MAD: Mindful Anti Distraction

+

Do something more rewarding instead!


-
- +
+ -

{{ alt.text }}

-

X

+ +
+ + +
+ +

{{ newAltText }}

+

PREVIEW

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

Required

+
+
+
+ +
+ +
+
+

Required: Proper URL (http/https)

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

Add your Link

 +
+
+ -
-

Options

+
+

BlockList

-Favorite color: - +
+
+
+
+
+
+ +
+
+ + +
+
+
+
+
+

ASSIST FUTURE SELF

+
+

Simple Domain Block

+
+ +
+
+ +
+
+
+

Exactsies Block

+
+ +
+
+ +
+
+ +
+
+
+
+
+ + +
+
- - -
- - - + diff --git a/popup.html b/popup.html index 2d2332a..7a8fa14 100644 --- a/popup.html +++ b/popup.html @@ -1,21 +1,26 @@ - + - + + + + + + + + - -
Yo Swag Son:
-
-
+
-
-
-
+
+ + diff --git a/test/mad-spec.js b/test/mad-spec.js new file mode 100644 index 0000000..9bc5231 --- /dev/null +++ b/test/mad-spec.js @@ -0,0 +1,7 @@ +describe('angularjs chrome', function() { + it('should block site', function() { + browser.get('http://www.reddit.com'); + expect(browser.getLocationAbsUrl()).not.toBe('http://www.reddit.com'); + + }); +});