Merge branch 'development'

MisterPhilip · Aug 5, 2018 · f412d7d · f412d7d
2 parents 4b40436 + 76d124b
commit f412d7d
Show file tree

Hide file tree

Showing 64 changed files with 4,839 additions and 6,227 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -12,18 +12,20 @@ module.exports = function(grunt) {
             },
             "production": {
                 "name": "Omnibug",
-                "version": "1.1.1",
+                "version": "1.2.0",
                 "storageKey": "omnibug",
                 "feedbackUrl": "https://omnibug.io/feedback",
                 "analyticsID": "UA-114343677-2"
             }
         },
         "chrome": {
-            "folder": "chromium"
+            "folder": "chromium",
+            "tracking": true
         },
         "firefox": {
             "gecko": "Omnibug@rosssimpson.com",
-            "folder": "firefox"
+            "folder": "firefox",
+            "tracking": false
         },
         "clean": {
             "chrome": ["platform/chromium", "build/chrome_*.zip"],
@@ -228,6 +230,7 @@ module.exports = function(grunt) {
         delete manifest.options_ui.chrome_style;
         delete manifest.options_page;
         delete manifest.background.persistent;
+        delete manifest.content_security_policy;
 
         grunt.file.write("platform/" + browserOptions.folder + "/manifest.json", JSON.stringify(manifest, null, 4));
         grunt.log.write("Created Firefox's manifest.json. ").ok();
@@ -236,7 +239,21 @@ module.exports = function(grunt) {
     grunt.registerTask("build-copy", "Copy over the source files to the build directory", function(browser) {
         grunt.config.requires(browser);
         let options = grunt.config(browser),
-            filesToCopy = ["eventPage.js", "providers.js", "options/*.*", "devtools/*.*", "assets/**", "libs/*.*", "popup/*.*", "!*./*.scss"];
+            filesToCopy = ["eventPage.js", "providers.js", "options/*.*", "devtools/*.*", "assets/**", "libs/*.*", "!libs/OmnibugTracker.*", "popup/*.*", "!**/*.scss", "!assets/styles/**"],
+            trackingLib = {
+                expand: true,
+                cwd: "src/libs/",
+                src: [],
+                dest: "./platform/" + options.folder + "/libs",
+                rename: function(path, name) {
+                    return path + "/OmnibugTracker.js";
+                }
+            };
+        if(options.tracking) {
+            trackingLib.src.push("OmnibugTracker.js");
+        } else {
+            trackingLib.src.push("OmnibugTracker.disabled.js");
+        }
 
         grunt.config.set("copy." + browser, {
             files: [
@@ -245,7 +262,8 @@ module.exports = function(grunt) {
                     cwd: "src/",
                     src: filesToCopy,
                     dest: "./platform/" + options.folder
-                }
+                },
+                trackingLib
             ]});
         grunt.task.run("copy:" + browser);
     });
@@ -346,7 +364,7 @@ module.exports = function(grunt) {
         });
         grunt.config.set("concat.test-settings", {
             "options": {
-                "banner": "import { OmnibugProvider } from \"./providers.js\"\n",
+                "banner": "import { OmnibugProvider } from \"./providers.js\"\nconst chrome = require('sinon-chrome/extensions');\n",
                 "footer": "\nexport { OmnibugSettings };"
             },
             "files": {
@@ -365,6 +383,16 @@ module.exports = function(grunt) {
                 ]
             }
         });
+        grunt.config.set("concat.test-tracker", {
+            "options": {
+                "footer": "\nexport { OmnibugTracker };"
+            },
+            "files": {
+                "./test/source/OmnibugTracker.js": [
+                    "./src/libs/OmnibugTracker.js",
+                ]
+            }
+        });
 
         /*
          * Splitting providers into 2 sections because:
@@ -439,7 +467,7 @@ module.exports = function(grunt) {
                 ]}
         });
 
-        grunt.task.run(["clean:test", "concat:providers-test", "concat:providers-test-individual", "concat:test-port", "concat:test-settings", "concat:test-helpers"]);
+        grunt.task.run(["clean:test", "concat:providers-test", "concat:providers-test-individual", "concat:test-port", "concat:test-settings", "concat:test-helpers", "concat:test-tracker"]);
     });
 
     /**

diff --git a/README.md b/README.md
@@ -5,13 +5,9 @@ Omnibug is a browser plugin to ease developing & maintaining web metrics impleme
 (sent by the browser) is checked for a pattern; if a match occurs, the URL is displayed in a panel, and decoded to show
 the details of the request
 
-For further details, see the [main project page](https://omnibug.io/) or come chat with us on [Discord](https://omnibug.io/discord)
+For further details, see the [main project page](https://omnibug.io/) or check out [our blog](https://omnibug.io/blog/).
 
 
 ## Get it
 [Chrome](https://chrome.google.com/webstore/detail/omnibug/bknpehncffejahipecakbfkomebjmokl) or
-[Firefox](https://addons.mozilla.org/en-US/firefox/addon/omnibug/)
-
-Logo "[Iconset: Bag O Tiles Icons](http://www.iconarchive.com/show/bag-o-tiles-icons-by-barkerbaggies.html)" by
-[barkerbaggies](http://www.iconarchive.com/artist/barkerbaggies.html), used under 
-[CC BY-SA 4.0](https://creativecommons.org/licenses/by-sa/4.0/)
+[Firefox](https://addons.mozilla.org/en-US/firefox/addon/omnibug/)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "omnibug",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "description": "Omnibug Extension",
   "main": "Gruntfile.js",
   "scripts": {
@@ -70,6 +70,7 @@
     "url": "https://github.com/MisterPhilip/omnibug/issues"
   },
   "devDependencies": {
+    "@fortawesome/fontawesome-free": "^5.2.0",
     "ava": "^0.25.0",
     "babel-cli": "^6.26.0",
     "babel-core": "^6.26.3",

diff --git a/src/assets/css/font.css b/src/assets/css/font.css