diff --git a/app/templates/app/layout.html b/app/templates/app/layout.html
index 07b0a77f..4a647e64 100644
--- a/app/templates/app/layout.html
+++ b/app/templates/app/layout.html
@@ -16,7 +16,6 @@
{% if isAnalyticsEnabled %}
{% endif%}
-
diff --git a/i5k/settings.py b/i5k/settings.py
index 3a0af69f..892f3c79 100755
--- a/i5k/settings.py
+++ b/i5k/settings.py
@@ -363,6 +363,7 @@
'app/scripts/respond.src.js',
'app/scripts/underscore.js',
'app/scripts/error.js',
+ 'app/scripts/Universal-Federated-Analytics-Min.js'
),
'output_filename': 'app/scripts/app-layout.min.js',
},
diff --git a/package-lock.json b/package-lock.json
index 93234392..5dba62eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1187,6 +1187,34 @@
"randombytes": "^2.0.0"
}
},
+ "digital-analytics-program": {
+ "version": "git+https://github.com/digital-analytics-program/gov-wide-code.git#fcba3b93059e23b8d1b31df25ac6c86597381395",
+ "from": "git+https://github.com/digital-analytics-program/gov-wide-code.git#fcba3b93059e23b8d1b31df25ac6c86597381395",
+ "requires": {
+ "uglify-js": "^3.4.9"
+ },
+ "dependencies": {
+ "commander": {
+ "version": "2.17.1",
+ "resolved": "https://registry.npmjs.org/commander/-/commander-2.17.1.tgz",
+ "integrity": "sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg=="
+ },
+ "source-map": {
+ "version": "0.6.1",
+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="
+ },
+ "uglify-js": {
+ "version": "3.4.9",
+ "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.4.9.tgz",
+ "integrity": "sha512-8CJsbKOtEbnJsTyv6LE6m6ZKniqMiFWmm9sRbopbkGs3gMPPfd3Fh8iIA4Ykv5MgaTbqHr4BaoGLJLZNhsrW1Q==",
+ "requires": {
+ "commander": "~2.17.1",
+ "source-map": "~0.6.1"
+ }
+ }
+ }
+ },
"dir-glob": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-2.0.0.tgz",
@@ -2659,9 +2687,9 @@
"dev": true
},
"jquery": {
- "version": "1.12.4",
- "resolved": "https://registry.npmjs.org/jquery/-/jquery-1.12.4.tgz",
- "integrity": "sha1-AeHfuikP5z3rp3zurLD5ui/sngw="
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
+ "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg=="
},
"jquery-hoverintent": {
"version": "1.9.0",
@@ -2678,11 +2706,6 @@
}
}
},
- "jquery-ui": {
- "version": "1.12.1",
- "resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz",
- "integrity": "sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE="
- },
"jquery-ui-dist": {
"version": "1.12.0",
"resolved": "https://registry.npmjs.org/jquery-ui-dist/-/jquery-ui-dist-1.12.0.tgz",
@@ -3062,9 +3085,9 @@
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
},
"nan": {
- "version": "2.11.0",
- "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.0.tgz",
- "integrity": "sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==",
+ "version": "2.11.1",
+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.11.1.tgz",
+ "integrity": "sha512-iji6k87OSXa0CcrLl9z+ZiYSuR2o+c0bGuNmXdrhTQTakxytAFsC56SArGYoiHlJlFoHSnvmhpceZJaXkVuOtA==",
"optional": true
},
"nanomatch": {
diff --git a/package.json b/package.json
index 1b451512..c573a613 100644
--- a/package.json
+++ b/package.json
@@ -34,8 +34,9 @@
"datatables.net-colreorder": "^1.5.1",
"datatables.net-colreorder-dt": "^1.5.1",
"datatables.net-dt": "^1.10.16",
+ "digital-analytics-program": "git+https://github.com/digital-analytics-program/gov-wide-code.git#fcba3b93059e23b8d1b31df25ac6c86597381395",
"disable-output-webpack-plugin": "^1.0.1",
- "jquery": "^1.11.1",
+ "jquery": "^3.3.1",
"jquery-hoverintent": "^1.9.0",
"jquery-ui-dist": "^1.12.0",
"jquery-ui-themes": "^1.12.0",
diff --git a/requirements.txt b/requirements.txt
index 2a65d31d..83938ac5 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,4 +15,4 @@ wsgiref==0.1.2
django-suit==0.2.26
six>=1.10.0
django-axes==2.3.3
-requests==2.18.4
+requests==2.20.0
diff --git a/webpack.config.js b/webpack.config.js
index dd518dff..974406b6 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -22,6 +22,7 @@ const appScriptConfig = {
{ from: path.join(nodeModules, '/bootstrap/dist/js/bootstrap.js'), to: appScripts},
{ from: path.join(nodeModules, '/underscore/underscore.js'), to: appScripts},
{ from: path.join(nodeModules, '/Respond.js/dest/respond.src.js'), to: appScripts},
+ { from: path.join(nodeModules, '/digital-analytics-program/Universal-Federated-Analytics-Min.js'), to: appScripts},
{ from: path.join(nodeModules, '/bootstrap/dist/css/bootstrap.css'), to: appStyles},
{ from: path.join(nodeModules, '/bootstrap/dist/css/bootstrap.css.map'), to: appStyles},
{ from: path.join(nodeModules, '/bootstrap/dist/fonts/glyphicons-halflings-regular.eot'), to: appFonts},