bckelley/cgm-remote-monitor
1
0
Fork 0
mirror of https://github.com/bckelley/cgm-remote-monitor.git synced 2026-08-24 03:14:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removing Bower part 1

Browse Source
This commit is contained in:
Sulka Haro
2017-08-15 22:24:23 +03:00
parent abb4db2271
commit 7df05f0198
10 changed files with 266 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bundle/bundle.source.js
+13 -2
View File
@@ -2,15 +2,25 @@ import '../static/css/drawer.css';
import '../static/css/main.css';
import '../static/css/dropdown.css';
import '../static/css/sgv.css';
import '../static/bower_components/tipsy-jmalonzo/src/stylesheets/tipsy.css';
import '../static/bower_components/jquery-ui/themes/ui-darkness/jquery-ui.min.css';
import '../node_modules/jquery.tipsy/src/jquery.tipsy.css';
(function () {
window._ = require('lodash');
window.d3 = require('d3');
window.$ = window.jQuery = require('jquery');
window.tipsy = require('jquery.tipsy');
window.jqui = require('jquery-ui/ui/core');
window.Storage = require('js-storage');
window.flot = require('flot');
window.moment = require('moment-timezone');
// window.sugar = require('sugar');
// window.crossfilter = require('crossfilter');
window.Nightscout = window.Nightscout || {};
@@ -26,3 +36,4 @@ import '../static/bower_components/jquery-ui/themes/ui-darkness/jquery-ui.min.cs
})();
//import '../node_modules/jquery.tipsy/src/jquery.tipsy.js';
lib/client/boluscalc.js
+3 -2
View File
@@ -3,12 +3,13 @@
var _ = require('lodash');
var moment = require('moment-timezone');
var times = require('../times');
var Storages = require('js-storage');
function init(client, $) {
var boluscalc = { };
var translate = client.translate;
var storage = $.localStorage;
var storage = Storages.localStorage;
var iob = client.plugins('iob');
var cob = client.plugins('cob');
@@ -176,7 +177,7 @@ function init(client, $) {
$('#bc_quickpick').val(-1);
$('#bc_preBolus').val(0);
$('#bc_notes').val('');
$('#bc_enteredBy').val($.localStorage.get('enteredBy') || '');
$('#bc_enteredBy').val(Storages.localStorage.get('enteredBy') || '');
$('#bc_nowtime').prop('checked', true);
$('#bc_othercorrection').val(0);
$('#bc_profile').val(client.profilefunctions.activeProfileToTime());
lib/client/browser-settings.js
+2 -1
View File
@@ -4,12 +4,13 @@ var _ = require('lodash');
// VERSION 1 - 0.9.0 - 2015-Nov-07 - initial version
var STORAGE_VERSION = 1;
var Storages = require('js-storage');
function init (client, serverSettings, $) {
serverSettings = serverSettings || {settings: {}};
var storage = $.localStorage;
var storage = Storages.localStorage;
var settings = require('../settings')();
function loadForm ( ) {
lib/client/careportal.js
+2 -1
View File
@@ -4,12 +4,13 @@ var moment = require('moment-timezone');
var _ = require('lodash');
var parse_duration = require('parse-duration'); // https://www.npmjs.com/package/parse-duration
var times = require('../times');
var Storages = require('js-storage');
function init (client, $) {
var careportal = { };
var translate = client.translate;
var storage = $.localStorage;
var storage = Storages.localStorage;
careportal.allEventTypes = client.plugins.getAllEventTypes(client.sbx);
lib/client/index.js
+6 -4
View File
@@ -6,6 +6,8 @@ var $ = (global && global.$) || require('jquery');
var d3 = (global && global.d3) || require('d3');
var shiroTrie = require('shiro-trie');
var Storages = require('js-storage');
var language = require('../language')();
var sandbox = require('../sandbox')();
var profile = require('../profilefunctions')();
@@ -37,7 +39,7 @@ client.init = function init(callback) {
client.browserUtils = require('./browser-utils')($);
var token = client.browserUtils.queryParms().token;
var secret = client.hashauth.apisecrethash || $.localStorage.get('apisecrethash');
var secret = client.hashauth.apisecrethash || Storages.localStorage.get('apisecrethash');
var src = '/api/v1/status.json?t=' + new Date().getTime();
@@ -148,7 +150,7 @@ client.load = function load(serverSettings, callback) {
, bus: require('../bus')(client.settings, client.ctx)
, settings: client.settings
, notifications: require('../notifications')(client.settings, client.ctx)
, pluginBase: client.plugins.base(majorPills, minorPills, statusPills, bgStatus, client.tooltip, $.localStorage)
, pluginBase: client.plugins.base(majorPills, minorPills, statusPills, bgStatus, client.tooltip, Storages.localStorage)
};
client.sbx = sandbox.clientInit(client.ctx, client.now);
@@ -460,7 +462,7 @@ client.load = function load(serverSettings, callback) {
.value()
.join(' ');
}
$.localStorage.set('showForecast', client.settings.showForecast);
Storages.localStorage.set('showForecast', client.settings.showForecast);
refreshChart(true);
});
viewMenu.append(forecastOption);
@@ -853,7 +855,7 @@ client.load = function load(serverSettings, callback) {
li.addClass('selected');
var hours = Number(li.data('hours'));
client.foucusRangeMS = times.hours(hours).msecs;
$.localStorage.set('focusHours', hours);
Storages.localStorage.set('focusHours', hours);
refreshChart();
} else {
viewDropdown.open(e);
lib/hashauth.js
+4 -3
View File
@@ -1,6 +1,7 @@
'use strict';
var crypto = require('crypto');
var Storages = require('js-storage');
var hashauth = {
apisecret: ''
@@ -47,7 +48,7 @@ hashauth.init = function init(client, $) {
};
hashauth.initAuthentication = function initAuthentication(next) {
hashauth.apisecrethash = hashauth.apisecrethash || $.localStorage.get('apisecrethash') || null;
hashauth.apisecrethash = hashauth.apisecrethash || Storages.localStorage.get('apisecrethash') || null;
hashauth.verifyAuthentication(function () {
hashauth.injectHtml();
if (next) { next( hashauth.isAuthenticated() ); }
@@ -57,7 +58,7 @@ hashauth.init = function init(client, $) {
hashauth.removeAuthentication = function removeAuthentication(event) {
$.localStorage.remove('apisecrethash');
Storages.localStorage.remove('apisecrethash');
if (hashauth.authenticated) {
client.browserUtils.reload();
@@ -135,7 +136,7 @@ hashauth.init = function init(client, $) {
hashauth.verifyAuthentication( function(isok) {
if (isok) {
if (hashauth.storeapisecret) {
$.localStorage.set('apisecrethash',hashauth.apisecrethash);
Storages.localStorage.set('apisecrethash',hashauth.apisecrethash);
}
$('#authentication_placeholder').html(hashauth.inlineCode());
if (callback) {
package-lock.json
Generated
+219 -154
View File
@@ -171,15 +171,6 @@
"resolved": "https://registry.npmjs.org/arrify/-/arrify-1.0.1.tgz",
"integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0="
},
"ascli": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
"integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
"requires": {
"colour": "0.7.1",
"optjs": "3.2.2"
}
},
"asn1": {
"version": "0.1.11",
"resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
@@ -271,6 +262,11 @@
"resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
"integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg="
},
"base64-js": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
"integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw=="
},
"base64id": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
@@ -394,11 +390,6 @@
"chainsaw": "0.1.0"
}
},
"bower": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/bower/-/bower-1.8.0.tgz",
"integrity": "sha1-Vdvr7wrZFVOC2enT5JfBNyNFtEo="
},
"brace-expansion": {
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
@@ -554,13 +545,6 @@
"base64-js": "1.2.1",
"ieee754": "1.1.8",
"isarray": "1.0.0"
},
"dependencies": {
"base64-js": {
"version": "1.2.1",
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.2.1.tgz",
"integrity": "sha512-dwVUVIXsBZXwTuwnXI9RK8sBmgq09NDHzyR9SAph9eqk76gKK2JSQmZARC2zRC81JC2QTtxD0ARU5qTS25gIGw=="
}
}
},
"buffer-equal-constant-time": {
@@ -932,6 +916,19 @@
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
},
"console-browserify": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
"requires": {
"date-now": "0.1.4"
}
},
"constants-browserify": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
},
"content-disposition": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.2.tgz",
@@ -1025,6 +1022,23 @@
"boom": "2.10.1"
}
},
"crypto-browserify": {
"version": "3.11.1",
"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz",
"integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==",
"requires": {
"browserify-cipher": "1.0.0",
"browserify-sign": "4.0.4",
"create-ecdh": "4.0.0",
"create-hash": "1.1.3",
"create-hmac": "1.1.6",
"diffie-hellman": "5.0.2",
"inherits": "2.0.3",
"pbkdf2": "3.0.13",
"public-encrypt": "4.0.0",
"randombytes": "2.0.5"
}
},
"css-color-names": {
"version": "0.0.4",
"resolved": "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz",
@@ -1180,7 +1194,7 @@
"resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
"integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
"requires": {
"es5-ext": "0.10.26"
"es5-ext": "0.10.27"
}
},
"d3": {
@@ -1276,11 +1290,6 @@
"resolved": "https://registry.npmjs.org/director/-/director-1.2.7.tgz",
"integrity": "sha1-v9N0EHX9f7GlsuE2WMX0vsd3NvM="
},
"dom-walk": {
"version": "0.1.1",
"resolved": "https://registry.npmjs.org/dom-walk/-/dom-walk-0.1.1.tgz",
"integrity": "sha1-ZyIm3HTI95mtNTB9+TaroRrNYBg="
},
"domain-browser": {
"version": "1.1.7",
"resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.1.7.tgz",
@@ -1482,9 +1491,9 @@
}
},
"es5-ext": {
"version": "0.10.26",
"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.26.tgz",
"integrity": "sha1-UbISilMbcMT2dkCTpzy+u4IYY3I=",
"version": "0.10.27",
"resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.27.tgz",
"integrity": "sha512-3KXJRYzKXTd7xfFy5uZsJCXue55fAYQ035PRjyYk2PicllxIwcW9l3AbM/eGaw3vgVAUW4tl4xg9AXDEI6yw0w==",
"requires": {
"es6-iterator": "2.0.1",
"es6-symbol": "3.1.1"
@@ -1496,7 +1505,7 @@
"integrity": "sha1-jjGcnwRTv1ddN0lAplWSDlnKVRI=",
"requires": {
"d": "1.0.0",
"es5-ext": "0.10.26",
"es5-ext": "0.10.27",
"es6-symbol": "3.1.1"
}
},
@@ -1506,7 +1515,7 @@
"integrity": "sha1-kTbgUD3MBqMBaQ8LsU/042TpSfA=",
"requires": {
"d": "1.0.0",
"es5-ext": "0.10.26",
"es5-ext": "0.10.27",
"es6-iterator": "2.0.1",
"es6-set": "0.1.5",
"es6-symbol": "3.1.1",
@@ -1524,7 +1533,7 @@
"integrity": "sha1-0rPsXU2ADO2BjbU40ol02wpzzLE=",
"requires": {
"d": "1.0.0",
"es5-ext": "0.10.26",
"es5-ext": "0.10.27",
"es6-iterator": "2.0.1",
"es6-symbol": "3.1.1",
"event-emitter": "0.3.5"
@@ -1536,7 +1545,7 @@
"integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
"requires": {
"d": "1.0.0",
"es5-ext": "0.10.26"
"es5-ext": "0.10.27"
}
},
"es6-weak-map": {
@@ -1545,7 +1554,7 @@
"integrity": "sha1-XjqzIlH/0VOKH45f+hNXdy+S2W8=",
"requires": {
"d": "1.0.0",
"es5-ext": "0.10.26",
"es5-ext": "0.10.27",
"es6-iterator": "2.0.1",
"es6-symbol": "3.1.1"
}
@@ -1624,7 +1633,7 @@
"integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
"requires": {
"d": "1.0.0",
"es5-ext": "0.10.26"
"es5-ext": "0.10.27"
}
},
"event-stream": {
@@ -1708,9 +1717,9 @@
}
},
"express": {
"version": "4.15.3",
"resolved": "https://registry.npmjs.org/express/-/express-4.15.3.tgz",
"integrity": "sha1-urZdDwOqgMNYQIly/HAPkWlEtmI=",
"version": "4.15.4",
"resolved": "https://registry.npmjs.org/express/-/express-4.15.4.tgz",
"integrity": "sha1-Ay4iU0ic+PzgJma+yj0R7XotrtE=",
"requires": {
"accepts": "1.3.3",
"array-flatten": "1.1.1",
@@ -1718,28 +1727,48 @@
"content-type": "1.0.2",
"cookie": "0.3.1",
"cookie-signature": "1.0.6",
"debug": "2.6.7",
"depd": "1.1.0",
"debug": "2.6.8",
"depd": "1.1.1",
"encodeurl": "1.0.1",
"escape-html": "1.0.3",
"etag": "1.8.0",
"finalhandler": "1.0.3",
"finalhandler": "1.0.4",
"fresh": "0.5.0",
"merge-descriptors": "1.0.1",
"methods": "1.1.2",
"on-finished": "2.3.0",
"parseurl": "1.3.1",
"path-to-regexp": "0.1.7",
"proxy-addr": "1.1.4",
"qs": "6.4.0",
"proxy-addr": "1.1.5",
"qs": "6.5.0",
"range-parser": "1.2.0",
"send": "0.15.3",
"serve-static": "1.12.3",
"send": "0.15.4",
"serve-static": "1.12.4",
"setprototypeof": "1.0.3",
"statuses": "1.3.1",
"type-is": "1.6.15",
"utils-merge": "1.0.0",
"vary": "1.1.1"
},
"dependencies": {
"debug": {
"version": "2.6.8",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
"requires": {
"ms": "2.0.0"
}
},
"depd": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
"integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
},
"qs": {
"version": "6.5.0",
"resolved": "https://registry.npmjs.org/qs/-/qs-6.5.0.tgz",
"integrity": "sha512-fjVFjW9yhqMhVGwRExCXLhJKrLlkYSaxNWdyc9rmHlrVZbk35YHH312dFd7191uQeXkI3mKLZTIbSvIeFwFemg=="
}
}
},
"express-extension-to-accept": {
@@ -1875,17 +1904,27 @@
}
},
"finalhandler": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.3.tgz",
"integrity": "sha1-70fneVDpmXgOhgIqVg4yF+DQzIk=",
"version": "1.0.4",
"resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.4.tgz",
"integrity": "sha512-16l/r8RgzlXKmFOhZpHBztvye+lAhC5SU7hXavnerC9UfZqZxxXl3BzL8MhffPT3kF61lj9Oav2LKEzh0ei7tg==",
"requires": {
"debug": "2.6.7",
"debug": "2.6.8",
"encodeurl": "1.0.1",
"escape-html": "1.0.3",
"on-finished": "2.3.0",
"parseurl": "1.3.1",
"statuses": "1.3.1",
"unpipe": "1.0.0"
},
"dependencies": {
"debug": {
"version": "2.6.8",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
"requires": {
"ms": "2.0.0"
}
}
}
},
"find-up": {
@@ -1923,6 +1962,11 @@
"resolved": "https://registry.npmjs.org/flatten/-/flatten-1.0.2.tgz",
"integrity": "sha1-2uRqnXj74lKSJYzB54CkHZXAN4I="
},
"flot": {
"version": "0.8.0-alpha",
"resolved": "https://registry.npmjs.org/flot/-/flot-0.8.0-alpha.tgz",
"integrity": "sha1-nLvHFHwQpH0lSduQvSmH7BunhLo="
},
"for-in": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
@@ -2893,15 +2937,6 @@
"is-glob": "2.0.1"
}
},
"global": {
"version": "4.3.2",
"resolved": "https://registry.npmjs.org/global/-/global-4.3.2.tgz",
"integrity": "sha1-52mJJopsdMOJCLEwWxD8DjlOnQ8=",
"requires": {
"min-document": "2.19.0",
"process": "0.5.2"
}
},
"graceful-fs": {
"version": "4.1.11",
"resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
@@ -3239,9 +3274,9 @@
"integrity": "sha1-EEqOSqym09jNFXqO+L+rLXo//bY="
},
"ipaddr.js": {
"version": "1.3.0",
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.3.0.tgz",
"integrity": "sha1-HgOlL9rYOou7KyXL9JmLTP/NPew="
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.4.0.tgz",
"integrity": "sha1-KWrKh4qCGBbluF0KKFqZvP9FgvA="
},
"is-absolute-url": {
"version": "2.1.0",
@@ -3433,11 +3468,29 @@
"resolved": "https://registry.npmjs.org/jquery/-/jquery-2.2.4.tgz",
"integrity": "sha1-LInWiJterFIqfuoywUUhVZxsvwI="
},
"jquery-ui": {
"version": "1.12.1",
"resolved": "https://registry.npmjs.org/jquery-ui/-/jquery-ui-1.12.1.tgz",
"integrity": "sha1-vLQEXI3QU5wTS8FIjN0+dop6nlE="
},
"jquery.tipsy": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/jquery.tipsy/-/jquery.tipsy-1.0.3.tgz",
"integrity": "sha1-ZI86kCXTQr4ccoDyO3DEGDWoWxM=",
"requires": {
"jquery": "2.2.4"
}
},
"js-base64": {
"version": "2.1.9",
"resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.1.9.tgz",
"integrity": "sha1-8OgK4DmkvWVLXygfyT8EqRSn/M4="
},
"js-storage": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/js-storage/-/js-storage-1.0.1.tgz",
"integrity": "sha1-O1t/z0xIDwiVsXKYlL/Ohi+PjN8="
},
"js-tokens": {
"version": "3.0.2",
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz",
@@ -3542,9 +3595,9 @@
"integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk="
},
"jsonwebtoken": {
"version": "7.4.1",
"resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.1.tgz",
"integrity": "sha1-fKMk9SFfi+A5zTWmxFu4y3SkSPs=",
"version": "7.4.2",
"resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-7.4.2.tgz",
"integrity": "sha1-VxuQPAfodcD8WSA9GseGZ9gOCc0=",
"requires": {
"joi": "6.10.1",
"jws": "3.1.4",
@@ -3895,14 +3948,6 @@
"resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.1.0.tgz",
"integrity": "sha1-5md4PZLonb00KBi1IwudYqZyrRg="
},
"min-document": {
"version": "2.19.0",
"resolved": "https://registry.npmjs.org/min-document/-/min-document-2.19.0.tgz",
"integrity": "sha1-e9KC4/WELtKVu3SM3Z8f+iyCRoU=",
"requires": {
"dom-walk": "0.1.1"
}
},
"minimalistic-assert": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.0.tgz",
@@ -4020,12 +4065,12 @@
}
},
"mongodb": {
"version": "2.2.30",
"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.30.tgz",
"integrity": "sha1-jM2AH2dsgXIEDC8rR+lgKg1WNKs=",
"version": "2.2.31",
"resolved": "https://registry.npmjs.org/mongodb/-/mongodb-2.2.31.tgz",
"integrity": "sha1-GUBEXGYeGSF7s7+CRdmFSq71SNs=",
"requires": {
"es6-promise": "3.2.1",
"mongodb-core": "2.1.14",
"mongodb-core": "2.1.15",
"readable-stream": "2.2.7"
},
"dependencies": {
@@ -4046,9 +4091,9 @@
}
},
"mongodb-core": {
"version": "2.1.14",
"resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.14.tgz",
"integrity": "sha1-E8uidkImtb49GJkq8Mljzl6g8P0=",
"version": "2.1.15",
"resolved": "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.15.tgz",
"integrity": "sha1-hB9TuH//9MdFgYnDXIroJ+EWl2Q=",
"requires": {
"bson": "1.0.4",
"require_optional": "1.0.1"
@@ -4178,54 +4223,19 @@
"os-browserify": "0.2.1",
"path-browserify": "0.0.0",
"process": "0.11.10",
"punycode": "1.2.4",
"punycode": "1.4.1",
"querystring-es3": "0.2.1",
"readable-stream": "2.3.3",
"stream-browserify": "2.0.1",
"stream-http": "2.7.2",
"string_decoder": "0.10.31",
"timers-browserify": "2.0.3",
"timers-browserify": "2.0.4",
"tty-browserify": "0.0.0",
"url": "0.11.0",
"util": "0.10.3",
"vm-browserify": "0.0.4"
},
"dependencies": {
"console-browserify": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz",
"integrity": "sha1-8CQcRXMKn8YyOyBtvzjtx0HQuxA=",
"requires": {
"date-now": "0.1.4"
}
},
"constants-browserify": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
"integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U="
},
"crypto-browserify": {
"version": "3.11.1",
"resolved": "https://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.11.1.tgz",
"integrity": "sha512-Na7ZlwCOqoaW5RwUK1WpXws2kv8mNhWdTlzob0UXulk6G9BDbyiJaGTYBIX61Ozn9l1EPPJpICZb4DaOpT9NlQ==",
"requires": {
"browserify-cipher": "1.0.0",
"browserify-sign": "4.0.4",
"create-ecdh": "4.0.0",
"create-hash": "1.1.3",
"create-hmac": "1.1.6",
"diffie-hellman": "5.0.2",
"inherits": "2.0.3",
"pbkdf2": "3.0.13",
"public-encrypt": "4.0.0",
"randombytes": "2.0.5"
}
},
"process": {
"version": "0.11.10",
"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
"integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
},
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
@@ -4254,7 +4264,7 @@
"requires": {
"hosted-git-info": "2.5.0",
"is-builtin-module": "1.0.0",
"semver": "5.3.0",
"semver": "5.4.1",
"validate-npm-package-license": "3.0.1"
}
},
@@ -5111,9 +5121,9 @@
}
},
"process": {
"version": "0.5.2",
"resolved": "https://registry.npmjs.org/process/-/process-0.5.2.tgz",
"integrity": "sha1-FjjYqONML0QKkduVq5rrZ3/Bhc8="
"version": "0.11.10",
"resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
"integrity": "sha1-czIwDoQBYb2j5podHZGn1LwW8YI="
},
"process-nextick-args": {
"version": "1.0.7",
@@ -5139,15 +5149,26 @@
"requires": {
"ascli": "1.0.1",
"bytebuffer": "3.1.1"
},
"dependencies": {
"ascli": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/ascli/-/ascli-1.0.1.tgz",
"integrity": "sha1-vPpZdKYvGOgcq660lzKrSoj5Brw=",
"requires": {
"colour": "0.7.1",
"optjs": "3.2.2"
}
}
}
},
"proxy-addr": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.4.tgz",
"integrity": "sha1-J+VF9pYKRKYn2bREZ+NcG2tM4vM=",
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.1.5.tgz",
"integrity": "sha1-ccDuOxAt4/IC87ZPYI0XP8uhqRg=",
"requires": {
"forwarded": "0.1.0",
"ipaddr.js": "1.3.0"
"ipaddr.js": "1.4.0"
}
},
"prr": {
@@ -5199,14 +5220,14 @@
}
},
"punycode": {
"version": "1.2.4",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.2.4.tgz",
"integrity": "sha1-VACKyXKux0F13vnLpt9/qdORh0A="
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
"integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4="
},
"pushover-notifications": {
"version": "0.2.3",
"resolved": "https://registry.npmjs.org/pushover-notifications/-/pushover-notifications-0.2.3.tgz",
"integrity": "sha1-KWrEFcs3hoqwIEm4iBKyW2D4+G8="
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/pushover-notifications/-/pushover-notifications-0.2.4.tgz",
"integrity": "sha1-icuU+RgsNqpZqaxnROSa2K/00Gc="
},
"q": {
"version": "1.5.0",
@@ -5564,7 +5585,7 @@
"integrity": "sha512-qhM/y57enGWHAe3v/NcwML6a3/vfESLe/sGM2dII+gEO0BpKRUkWZow/tyloNqJyN6kXSl3RyyM8Ll5D/sJP8g==",
"requires": {
"resolve-from": "2.0.0",
"semver": "5.3.0"
"semver": "5.4.1"
}
},
"resolve": {
@@ -5654,39 +5675,65 @@
}
},
"semver": {
"version": "5.3.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz",
"integrity": "sha1-myzl094C0XxgEq0yaqa00M9U+U8="
"version": "5.4.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-5.4.1.tgz",
"integrity": "sha512-WfG/X9+oATh81XtllIo/I8gOiY9EXRdv1cQdyykeXK17YcUW3EXUAi2To4pcH6nZtJPr7ZOpM5OMyWJZm+8Rsg=="
},
"send": {
"version": "0.15.3",
"resolved": "https://registry.npmjs.org/send/-/send-0.15.3.tgz",
"integrity": "sha1-UBP5+ZAj31DRvZiSwZ4979HVMwk=",
"version": "0.15.4",
"resolved": "https://registry.npmjs.org/send/-/send-0.15.4.tgz",
"integrity": "sha1-mF+qPihLAnPHkzZKNcZze9k5Bbk=",
"requires": {
"debug": "2.6.7",
"depd": "1.1.0",
"debug": "2.6.8",
"depd": "1.1.1",
"destroy": "1.0.4",
"encodeurl": "1.0.1",
"escape-html": "1.0.3",
"etag": "1.8.0",
"fresh": "0.5.0",
"http-errors": "1.6.1",
"http-errors": "1.6.2",
"mime": "1.3.4",
"ms": "2.0.0",
"on-finished": "2.3.0",
"range-parser": "1.2.0",
"statuses": "1.3.1"
},
"dependencies": {
"debug": {
"version": "2.6.8",
"resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz",
"integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=",
"requires": {
"ms": "2.0.0"
}
},
"depd": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz",
"integrity": "sha1-V4O04cRZ8G+lyif5kfPQbnoxA1k="
},
"http-errors": {
"version": "1.6.2",
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz",
"integrity": "sha1-CgAsyFcHGSp+eUbO7cERVfYOxzY=",
"requires": {
"depd": "1.1.1",
"inherits": "2.0.3",
"setprototypeof": "1.0.3",
"statuses": "1.3.1"
}
}
}
},
"serve-static": {
"version": "1.12.3",
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.3.tgz",
"integrity": "sha1-n0uhni8wMMVH+K+ZEHg47DjVseI=",
"version": "1.12.4",
"resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.12.4.tgz",
"integrity": "sha1-m2qpjutyU8Tu3Ewfb9vKYJkBqWE=",
"requires": {
"encodeurl": "1.0.1",
"escape-html": "1.0.3",
"parseurl": "1.3.1",
"send": "0.15.3"
"send": "0.15.4"
}
},
"set-blocking": {
@@ -6338,12 +6385,31 @@
"cookiejar": "2.1.1",
"debug": "2.6.7",
"extend": "3.0.1",
"form-data": "1.0.1",
"form-data": "1.0.0-rc4",
"formidable": "1.1.1",
"methods": "1.1.2",
"mime": "1.3.4",
"qs": "6.4.0",
"readable-stream": "2.3.3"
},
"dependencies": {
"async": {
"version": "1.5.2",
"resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz",
"integrity": "sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=",
"dev": true
},
"form-data": {
"version": "1.0.0-rc4",
"resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz",
"integrity": "sha1-BaxrwiIntD5EYfSIFhVUaZ1Pi14=",
"dev": true,
"requires": {
"async": "1.5.2",
"combined-stream": "1.0.5",
"mime-types": "2.1.15"
}
}
}
},
"supertest": {
@@ -6413,11 +6479,10 @@
"integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU="
},
"timers-browserify": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.3.tgz",
"integrity": "sha512-+JAqyNgg+M8+gXIrq2EeUr4kZqRz47Ysco7X5QKRGScRE9HIHckyHD1asozSFGeqx2nmPCgA8T5tIGVO0ML7/w==",
"version": "2.0.4",
"resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.4.tgz",
"integrity": "sha512-uZYhyU3EX8O7HQP+J9fTVYwsq90Vr68xPEFo7yrVImIxYvHgukBEgOB/SgGoorWVTzGM/3Z+wUNnboA4M8jWrg==",
"requires": {
"global": "4.3.2",
"setimmediate": "1.0.5"
}
},
@@ -6706,9 +6771,9 @@
"dev": true
},
"webpack": {
"version": "3.5.3",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-3.5.3.tgz",
"integrity": "sha1-5oZTljvaFG4hKDLASk2AQdK0uMg=",
"version": "3.5.4",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-3.5.4.tgz",
"integrity": "sha1-VYPrJj7Se3i1vRe/37DrGxzRv4E=",
"requires": {
"acorn": "5.1.1",
"acorn-dynamic-import": "2.0.2",
@@ -6783,7 +6848,7 @@
"chalk": "1.1.3",
"commander": "2.11.0",
"ejs": "2.5.7",
"express": "4.15.3",
"express": "4.15.4",
"filesize": "3.5.10",
"gzip-size": "3.0.0",
"lodash": "4.17.4",
package.json
+12 -8
View File
@@ -27,8 +27,9 @@
"start": "node server.js",
"test": "make test",
"env": "env",
"postinstall": "node node_modules/bower/bin/bower --allow-root install && webpack --config webpack.config.js",
"bundle": "webpack --config webpack.config.js"
"postinstall": "webpack --config webpack.config.js",
"bundle": "webpack --config webpack.config.js",
"bower": "node node_modules/bower/bin/bower --allow-root install && "
},
"config": {
"blanket": {
@@ -51,7 +52,6 @@
"async": "^0.9.2",
"body-parser": "^1.17.2",
"bootevent": "0.0.1",
"bower": "^1.8.0",
"compression": "^1.7.0",
"crossfilter": "^1.3.12",
"css-loader": "^0.28.4",
@@ -60,28 +60,32 @@
"errorhandler": "^1.5.0",
"event-stream": "^3.3.4",
"expand-braces": "^0.1.2",
"express": "^4.15.3",
"express": "^4.15.4",
"express-extension-to-accept": "0.0.2",
"express-minify": "^0.2.0",
"file-loader": "^0.11.2",
"flot": "^0.8.0-alpha",
"forever": "^0.15.3",
"git-rev": "git://github.com/bewest/git-rev.git",
"heapdump": "^0.3.9",
"jquery": "^2.2.4",
"jsonwebtoken": "^7.4.1",
"jquery-ui": "^1.12.1",
"jquery.tipsy": "^1.0.3",
"js-storage": "^1.0.1",
"jsonwebtoken": "^7.4.2",
"lodash": "^4.17.4",
"long": "^3.2.0",
"mfb": "^0.12.0",
"minimed-connect-to-nightscout": "git://github.com/mddub/minimed-connect-to-nightscout.git#v1.1.0",
"moment": "^2.18.1",
"moment-timezone": "^0.5.13",
"mongodb": "^2.2.30",
"mongodb": "^2.2.31",
"mongomock": "^0.1.2",
"mqtt": "^0.3.13",
"node-cache": "^4.1.1",
"parse-duration": "^0.1.1",
"prettyjson": "^1.2.1",
"pushover-notifications": "^0.2.3",
"pushover-notifications": "^0.2.4",
"request": "^2.81.0",
"sgvdata": "git://github.com/ktind/sgvdata.git#wip/protobuf",
"share2nightscout-bridge": "git://github.com/bewest/share2nightscout-bridge.git#wip/generalize",
@@ -92,7 +96,7 @@
"sugar": "^1.5.0",
"traverse": "^0.6.6",
"uglify-js": "^3.0.27",
"webpack": "^3.5.3"
"webpack": "^3.5.4"
},
"devDependencies": {
"benv": "3.3.0",
static/index.html
+3 -3
View File
@@ -35,6 +35,9 @@
<link rel="stylesheet" type="text/css" href="/bower_components/tipsy-jmalonzo/src/stylesheets/tipsy.css" />
<link rel="stylesheet" type="text/css" href="/bower_components/jquery-ui/themes/ui-darkness/jquery-ui.min.css">
-->
<link rel="stylesheet" type="text/css" href="/css/ui-darkness/jquery-ui.min.css">
</head>
<body>
<div class="container loading" id="container">
@@ -596,9 +599,6 @@
<script src="/js/bundle.js?v=0.10.0-dev-20170716"></script>
<script src="/socket.io/socket.io.js"></script>
<script src="/bower_components/jQuery-Storage-API/jquery.storageapi.min.js"></script>
<script src="/bower_components/tipsy-jmalonzo/src/javascripts/jquery.tipsy.js"></script>
<script src="/bower_components/jquery-ui/jquery-ui.min.js"></script>
<script src="/js/client.js"></script>
</body>
</html>
static/report/index.html
+2 -8
View File
@@ -24,7 +24,8 @@
<meta name="theme-color" content="#333333">
<link rel="stylesheet" type="text/css" href="/css/report.css?v=0.10.0-dev-20170716" />
<link rel="stylesheet" type="text/css" href="/bower_components/jquery-ui/themes/ui-lightness/jquery-ui.min.css">
<link rel="stylesheet" type="text/css" href="/css/ui-lightness/jquery-ui.min.css">
</head>
<body>
<h1><img src="/images/logo1.png"><span class="translate">Nightscout reporting</span></h1>
@@ -118,13 +119,6 @@
<script src="/js/bundle.js?v=0.10.0-dev-20170716"></script>
<script src="/socket.io/socket.io.js"></script>
<script src="/bower_components/jQuery-Storage-API/jquery.storageapi.min.js"></script>
<script src="/bower_components/tipsy-jmalonzo/src/javascripts/jquery.tipsy.js"></script>
<script src="/bower_components/jquery-flot/jquery.flot.js"></script>
<script src="/bower_components/jquery-flot/jquery.flot.pie.js"></script>
<script src="/bower_components/jquery-flot/jquery.flot.time.js"></script>
<script src="/bower_components/jquery-flot/jquery.flot.fillbetween.js"></script>
<script src="/bower_components/jquery-ui/jquery-ui.min.js"></script>
<script src="/report/js/report.js?v=0.10.0-dev-20170716"></script>
<script src="/report/js/flotcandle.js"></script>
</body>