upgrade analytics #23; implemented privacy option and warning

BrynM · Aug 29, 2015 · ead2f6e · ead2f6e
1 parent 9c1f706
commit ead2f6e
Show file tree

Hide file tree

Showing 15 changed files with 328 additions and 84 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -7,7 +7,7 @@ var _ = require('underscore')
 module.exports = function(grunt) {
 
 	function tpl_banner(fileName) {
-
+		var txt;
 		var pre = [
 			'/*!',
 		];
@@ -17,7 +17,7 @@ module.exports = function(grunt) {
 			pre.push('*');
 		}
 
-		var txt = [
+		txt = [
 			'* '+manifest.name+' '+manifest.version,
 			'* https://reddit.com/r/Narcikamra',
 			'*',

diff --git a/lib/google-analytics-bundle.js b/lib/google-analytics-bundle.js
diff --git a/manifest.json b/manifest.json
@@ -1,7 +1,7 @@
 {
 	"name": "Narcikarma",
 	"short_name": "Narcikarma",
-	"version": "0.5013",
+	"version": "0.5014",
 	"manifest_version": 2,
 	"description": "A Reddit karma tracker for Google Chrome by badmonkey0001",
 	"browser_action": {
@@ -27,7 +27,10 @@
 		"cookies",
 		"*://www.reddit.com/*",
 		"*://narcikarma.net/*",
+		"https://www.google-analytics.com/",
+		"https://ssl.google-analytics.com/",
 		"notifications",
+		"storage",
 		"unlimitedStorage"
 	]
 }
diff --git a/nckma_html/_test_canvas.html b/nckma_html/_test_canvas.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Narcikarma Canvas Test</title>
 	<link href="../nckma_assets/narcikarma.css" rel="stylesheet" type="text/css">
-	<script src="../nckma_scripts/ga.js"></script>
+	<script src="../lib/google-analytics-bundle.js"></script>
 </head>
 <body class="nckTestCanvas">
 

diff --git a/nckma_html/background.html b/nckma_html/background.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Narcikarma Background Task</title>
 	<link href="../nckma_assets/narcikarma.css" rel="stylesheet" type="text/css">
-	<script src="../nckma_scripts/ga.js"></script>
+	<script src="../lib/google-analytics-bundle.js"></script>
 </head>
 <body class="nckBackground">
 
@@ -15,6 +15,7 @@ <h1>Narcikarma Background Task</h1>
 	<script src="../lib/jquery-1.8.2.min.js"></script>
 	<script src="../lib/underscore-min.js"></script>
 	<script src="../lib/bpmv.js"></script>
+	<script src="../lib/base64.js"></script>
 	<script src="../nckma_scripts/narcikarma.background.js"></script>
 	<script src="../nckma_scripts/narcikarma.core.js"></script>
 	<script src="../nckma_scripts/narcikarma.notifications.js"></script>

diff --git a/nckma_html/credits.html b/nckma_html/credits.html
@@ -2,7 +2,6 @@
 <head>
 	<title>Narcikarma Credits</title>
 	<link href="../nckma_assets/narcikarma.css" rel="stylesheet" type="text/css">
-	<script src="../nckma_scripts/ga.js"></script>
 </head>
 <body class="">
 	<div class="nckContent">

diff --git a/nckma_html/graphs.html b/nckma_html/graphs.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Narcikarma Graphs</title>
 	<link href="../nckma_assets/narcikarma.css" rel="stylesheet" type="text/css">
-	<script src="../nckma_scripts/ga.js"></script>
+	<script src="../lib/google-analytics-bundle.js"></script>
 </head>
 <body class="nckGraphs">
 	<div class="nckContent">

diff --git a/nckma_html/options.html b/nckma_html/options.html
@@ -2,7 +2,7 @@
 <head>
 	<title>Narcikarma Options</title>
 	<link href="../nckma_assets/narcikarma.css" rel="stylesheet" type="text/css">
-	<script src="../nckma_scripts/ga.js"></script>
+	<script src="../lib/google-analytics-bundle.js"></script>
 </head>
 <body class="nckOptions">
 	<div class="nckContent">
@@ -296,9 +296,53 @@ <h3>Some utility functionality for your use.</h3>
 						<p>
 					</div>
 
-					<div class="clear"></div>
 				</div>
 			</div>
+
+			<div id="privacy_tab" class="tab-single">
+				<input type="radio" class="tab-radio" id="privacy_tab_radio" name="optionsTabs" />
+				<label for="privacy_tab_radio" class="tab-label">Privacy</label>
+				<div class="tab-contents">
+
+					<h3>Privacy</h3>
+
+					<p>
+						Narcikarma does not interact with or alter Reddit pages in any way.
+						Only minimal json APIs are used, such as me.json.
+						No browsing data is colledted at all.
+					</p>
+
+					<p>
+						Authentication is carried out by sharing cookies with reddit.com to make the JSON API requests.
+						The cookies are not viewed, used, or stored anywhere and this functionality is completey controlled by the browser.
+						The only account data stored is locally in your browser to report to you and is never transmitted to anyone else.
+					</p>
+
+					<p>
+						In the end, I don't want to know what you do. This is meant to merely be a tool you can use.
+					</p>
+
+					<h3>Anonoymous technical data collection</h3>
+
+					<p>
+						In order to see how much of the extension is used and track how many errors are thrown, it's very helpful to collect usage data.
+						Narcikmara only collects basic anonymous Google Analytics event data and internal function call counts as Analytics events.
+						No data about your accounts - Reddit, Google, or otherwise - is collected at all.
+						By default, Google Analytics does collect some location data however.
+					</p>
+
+					<p>
+						The data collected is primarily used to evaluate which portions of the code are getting used and which options are popular so they can become new defaults.
+					<p>
+
+					<div class="nckOptionsContainer" title="Show the karma change for all of the history, not just this browser session.">
+						<label for="opt_privacyOk"><h2>Allow collection of data</h2></label>
+						<input type="checkbox" id="opt_privacyOk" />&nbsp;<span id="opt_privacyOk_status"></span>
+					</div>
+
+				</div>
+			</div>
+
 		</div>
 
 		<hr>

diff --git a/nckma_html/popup.html b/nckma_html/popup.html
@@ -2,7 +2,6 @@
 <head>
 	<title>Narcikarma Popup</title>
 	<link href="../nckma_assets/narcikarma.css" rel="stylesheet" type="text/css">
-	<script src="../nckma_scripts/ga.js"></script>
 </head>
 <body class="nckPopup">
 

diff --git a/nckma_scripts/ga.js b/nckma_scripts/ga.js