Merge pull request #1 from CNS/iteration3

Iteration3
cns-iu · Apr 13, 2018 · d2a5e86 · d2a5e86
2 parents ed65891 + e9e7343
commit d2a5e86
Show file tree

Hide file tree

Showing 56 changed files with 478 additions and 485 deletions.
diff --git a/bower.json b/bower.json
@@ -2,27 +2,28 @@
   "name": "macroscopeKiosk",
   "version": "0.0.0",
   "dependencies": {
-    "angular": "~1.4.0",
-    "angular-animate": "~1.4.0",
-    "angular-material": "~0.9.7",
-    "angular-sanitize": "~1.4.0",
-    "angular-touch": "~1.4.0",
-    "angular-ui-router": "~0.2.15",
+    "angular": "~1.6.4",
+    "angular-animate": "~1.6.0",
+    "angular-material": "~1.0.0",
+    "angular-sanitize": "~1.6.0",
+    "angular-touch": "~1.6.0",
+    "angular-ui-router": "~1.0.0",
     "animate.css": "~3.3.0",
     "ng-idle": "~1.1.1",
     "videogular": "~1.4.0",
     "videogular-controls": "~1.4.0",
     "videogular-overlay-play": "~1.4.0",
     "videogular-themes-default": "~1.4.0",
     "angulartics": "^1.1.0",
-    "angulartics-google-analytics": "^0.1.4",
+    "angulartics-google-analytics": "^0.4.0",
     "angular-breadcrumb": "^0.4.1",
     "angular-loading-bar": "^0.9.0"
   },
   "devDependencies": {
-    "angular-mocks": "~1.4.0"
+    "angular-mocks": "^1.4.0"
   },
   "resolutions": {
-    "angular": "~1.4.0"
+    "angular": "~1.6.4",
+    "angulartics": "^1.1.0"
   }
 }
diff --git a/dist/assets/images/home-idle-overlay.png b/dist/assets/images/home-idle-overlay.png
diff --git a/dist/assets/images/instructions-academy-scope.png b/dist/assets/images/instructions-academy-scope.png
diff --git a/dist/assets/images/instructions-charting-culture.png b/dist/assets/images/instructions-charting-culture.png
diff --git a/dist/assets/images/instructions-earth.png b/dist/assets/images/instructions-earth.png
diff --git a/dist/assets/images/instructions-mapping-global-news.png b/dist/assets/images/instructions-mapping-global-news.png
diff --git a/dist/assets/images/test2.png b/dist/assets/images/test2.png
diff --git a/dist/index.html b/dist/index.html
@@ -1,3 +1,11 @@
-<!doctype html><html ng-app="macroscopeKiosk"><head><meta charset="utf-8"><title>macroscopeKiosk</title><meta name="description" content=""><meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"><link rel="stylesheet" href="styles/vendor-32ea316936.css"><link rel="stylesheet" href="styles/app-252ed8ca1f.css"></head><body><!--[if lt IE 10]>
+<!doctype html><html ng-app="macroscopeKiosk"><head><meta charset="utf-8"><title>macroscopeKiosk</title><meta name="description" content=""><meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no"><link rel="stylesheet" href="styles/vendor-0613f6696b.css"><link rel="stylesheet" href="styles/app-96361f9fed.css"></head><body><!--[if lt IE 10]>
  <p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
- <![endif]--><div ui-view="" flex="" layout="column" layout-fill=""></div><script src="scripts/vendor-ceb8572d26.js"></script><script src="scripts/app-8b2d159d02.js"></script></body></html>
+ <![endif]--><div ui-view="" flex="" layout="column" layout-fill=""></div><script src="scripts/vendor-060ffd2021.js"></script><script src="scripts/app-3a96a9e1bc.js"></script><script>
+      (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+      (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+      m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+      })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+      // ga('create', 'UA-64355125-1', {'cookieDomain':'none'});  //webApp:TEST
+      ga('create', 'UA-54599506-2', {'cookieDomain':'none'}); //CNS Analytics
+      </script></body></html>
diff --git a/dist/scripts/app-130ac539b2.js b/dist/scripts/app-130ac539b2.js
diff --git a/dist/scripts/app-1acf33a217.js b/dist/scripts/app-1acf33a217.js
diff --git a/dist/scripts/app-1e1d8dbcdc.js b/dist/scripts/app-1e1d8dbcdc.js
diff --git a/dist/scripts/app-2a117852c5.js b/dist/scripts/app-2a117852c5.js
diff --git a/dist/scripts/app-36dcb9a3d3.js b/dist/scripts/app-36dcb9a3d3.js
diff --git a/dist/scripts/app-3e41e50ed9.js b/dist/scripts/app-3e41e50ed9.js
diff --git a/dist/scripts/app-6cb06fca31.js b/dist/scripts/app-6cb06fca31.js
diff --git a/dist/scripts/app-92e926156b.js b/dist/scripts/app-92e926156b.js
diff --git a/dist/scripts/app-a11027fa58.js b/dist/scripts/app-a11027fa58.js
diff --git a/dist/scripts/app-a7304e29be.js b/dist/scripts/app-a7304e29be.js
diff --git a/dist/scripts/app-a8858b8494.js b/dist/scripts/app-a8858b8494.js
diff --git a/dist/scripts/app-b2af83d941.js b/dist/scripts/app-b2af83d941.js
diff --git a/dist/scripts/app-bfdd652746.js b/dist/scripts/app-bfdd652746.js
diff --git a/dist/scripts/app-cf6f7585f5.js b/dist/scripts/app-cf6f7585f5.js
diff --git a/dist/scripts/app-d2f49ee13f.js b/dist/scripts/app-d2f49ee13f.js
diff --git a/dist/scripts/app-ec71577172.js b/dist/scripts/app-ec71577172.js
diff --git a/dist/scripts/vendor-85e2ed25d2.js b/dist/scripts/vendor-85e2ed25d2.js
diff --git a/dist/scripts/vendor-ceb8572d26.js b/dist/scripts/vendor-ceb8572d26.js
diff --git a/dist/styles/app-0442278471.css b/dist/styles/app-0442278471.css
diff --git a/dist/styles/app-0a381cb7f9.css b/dist/styles/app-0a381cb7f9.css
diff --git a/dist/styles/app-2b50c84604.css b/dist/styles/app-2b50c84604.css
diff --git a/dist/styles/app-5beacdcad6.css b/dist/styles/app-5beacdcad6.css