kevinconroy · kevinconroy · Jul 21, 2019 · Feb 7, 2019 · Feb 7, 2019 · Feb 17, 2019
diff --git a/.bowerrc b/.bowerrc
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,14 @@
+module.exports = {
+    "plugins": [ ],
+    "extends": [
+      "eslint:recommended"
+    ],
+    "parser": "babel-eslint",
+    "env": {
+      "browser": true,
+      "commonjs": true,
+      "es6": true,
+      "node": true,
+      "jquery": true
+    }
+  };
diff --git a/.jsbeautifyrc b/.jsbeautifyrc
@@ -0,0 +1,16 @@
+{
+  "indent_size": 2
+  , "indent_char": " "
+  , "comma_first": true
+  , "keep-array-indentation": true
+  , "space_after_named_function": true
+  , "space_after_anon_function": true
+  , "end_with_newline": true
+  , "brace_style": "collapse,preserve-inline"
+  , "space_in_brace": true
+  , "space-in-paren": false
+  , "break-chained-methods": false
+  , "max-preserve-newlines": 2
+  , "space-after-anon-function": false
+  , "indent-empty-lines": false
+}
diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-8.x
+10.16.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,24 +1,32 @@
-language: node_js
-node_js:
-  - "10"
-  - "8"
-os: 
-  - osx
-before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
-  # https://github.com/Homebrew/homebrew-core/issues/26358
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink python; fi
-  # "brew install" can succeed but return 1 if it has "caveats".
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install mongodb || true; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew services start mongodb; fi
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install docker || true; fi
+sudo: required
+dist: xenial
+
+node_js-steps: &node_js-steps
+  language: node_js
+  before_install:
+    - if [[ `npm --version` != "6.4.1" ]]; then npm install -g npm@latest; npm --version; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
+    # https://github.com/Homebrew/homebrew-core/issues/26358
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew unlink python; fi
+    # "brew install" can succeed but return 1 if it has "caveats".
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install mongodb || true; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew services start mongodb; fi
+    - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install docker || true; fi
+  script: make travis
+  after_success:
+    - nvm version
+    - if [[ ! -z "$DOCKER_USER" ]]; then docker login -u ${DOCKER_USER} -p ${DOCKER_PASS} && git checkout -- . && git clean -fd . && make docker_release; fi
+  after_script: make report
+  services:
+    - mongodb
+    - docker
 matrix:
-  fast_finish: true
-services:
-  - mongodb
-  - docker
-script: make travis
-after_success:
-  - nvm version
-  - if [[ ! -z "$DOCKER_USER" ]]; then docker login -u ${DOCKER_USER} -p ${DOCKER_PASS} && git checkout -- . && git clean -fd . && make docker_release; fi
-after_script: make report
+  allow_failures:
+    node_js: "node"
+  include:
+    - node_js: "8"
+      <<: *node_js-steps
+    - node_js: "10"
+      <<: *node_js-steps
+    - node_js: "node" # Latest Node is not supported, and recommend, but we'll test it to know incompatibility issues
+      <<: *node_js-steps
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -3,11 +3,12 @@
 **Table of Contents**
 
 - [Contributing to cgm-remote-monitor](#contributing-to-cgm-remote-monitor)
-  - [Design](#design)
+  - [Design & new features](#design--new-features)
   - [Develop on `dev`](#develop-on-dev)
   - [Style Guide](#style-guide)
   - [Create a prototype](#create-a-prototype)
   - [Submit a pull request](#submit-a-pull-request)
+  - [Bug fixing](#bug-fixing)
   - [Comments and issues](#comments-and-issues)
   - [Co-ordination](#co-ordination)
   - [Other Dev Tips](#other-dev-tips)
@@ -53,6 +54,10 @@ We develop on the `dev` branch. All new pull requests should be targeted to `dev
 
 You can get the dev branch checked out using `git checkout dev`.
 
+Once checked out, install the dependencies using `npm install`, then copy the included `my.env.template`file to `my.env` and edit the file to include your settings (like the Mongo URL). Leave the `NODE_ENV=development` line intact. Once set, run the site using `npm run dev`. This will start Nigthscout in the development mode, with different code packaging rules and automatic restarting of the server using nodemon, when you save changed files on disk. The client also hot-reloads new code in, but it's recommended to reload the the website after changes due to the way the plugin sandbox works.
+
+If you want to additionaly test the site in production mode, create a file called `my.prod.env` that's a copy of the dev file but with `NODE_ENV=production` and start the site using `npm run prod`.
+
 ## Style Guide
 
 Some simple rules that will make it easier to maintain our codebase:
@@ -76,15 +81,7 @@ If in doubt, format your code with `js-beautify --indent-size 2 --comma-first  -
 
 ## Create a prototype
 
-<<<<<<< HEAD
-Fork cgm-remote-monitor and create a branch.
-You can create a branch using `git checkout -b wip/add-my-widget`.
-This creates a new branch called `wip/add-my-widget`.  The `wip`
-stands for work in progress and is a common prefix so that we know
-what to expect when reviewing many branches.
-=======
 Fork cgm-remote-monitor and create a branch. You can create a branch using `git checkout -b wip/add-my-widget`. This creates a new branch called `wip/add-my-widget`.  The `wip` stands for work in progress and is a common prefix so that when know what to expect when reviewing many branches.
->>>>>>> master
 
 ## Submit a pull request
 
@@ -95,8 +92,6 @@ This can be done by checking your code `git commit -avm 'my improvements are her
 Now that the commits are available on github, you can click on the compare buttons on your fork to create a pull request.  Make sure to select [Nightscout's `dev` branch](https://github.com/nightscout/cgm-remote-monitor/tree/dev).
 
 We assume all new Pull Requests are at least smoke tested by the author and all code in the PR actually works.
-<<<<<<< HEAD
-
 Please include a description of what the features do and rationalize why the changes are needed.
 
 If you add any new NPM module dependencies, you have to rationalize why there are needed - we prefer pull requests that reduce dependencies, not add them.
@@ -106,26 +101,13 @@ When adding new features that add confugration options, please ensure the `READM
 ## Bug fixing
 
 If you've fixed a bug, please consider adding a unit test to the `/tests` folder that reproduces the original bug without the change.
+
 Try to identify the root cause of the issue and fix the issue. Pull requests that simply add null checks to hide issues are unlikely to be accepted.
 
 This can be done by committing your code `git commit -avm 'my
 improvements are here'`, and pushing it to the branch you created on your own
 fork. This will probably look something like
 `git push -u origin wip/add-my-widget`.
-=======
-
-Please include a description of what the features do and rationalize why the changes are needed.
-
-If you add any new NPM module dependencies, you have to rationalize why there are needed - we prefer pull requests that reduce dependencies, not add them.
-
-When adding new features that add confugration options, please ensure the `README` document is amended with information on the new configuration.
-
-## Bug fixing
-
-If you've fixed a bug, please consider adding a unit test to the `/tests` folder that reproduces the original bug without the change.
-
-Try to identify the root cause of the issue and fix the issue. Pull requests that simply add null checks to hide issues are unlikely to be accepted.
->>>>>>> master
 
 Please include instructions how to test the changes.
 
@@ -137,25 +119,11 @@ We encourage liberal use of the comments, including images where appropriate.
 
 Most cgm-remote-monitor hackers use github's ticketing system, along with Facebook cgm-in-the-cloud, and gitter.
 
-<<<<<<< HEAD
-We use [git-flow](https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow), with `master` as our production, stable branch, and
-`dev` is used to queue changes for upcoming releases.  Everything else is
-done on branches, hopefully with names that indicate what to expect.
-
-Once `dev` has been reviewed and people feel it's time to release, we
-follow the git-flow release process, which creates a new tag and bumps
-the version correctly.  See [sem-ver](https://semver.org/) for versioning strategy.
-
-Every commit is tested by Travis CI.  We encourage adding tests to
-validate your design.  We encourage discussing your use cases to help
-everyone get a better understanding of your design.
-=======
 We use git-flow, with `master` as our production, stable branch, and `dev` is used to queue up for upcoming releases.  Everything else is done on branches, hopefully with names that indicate what to expect.
 
 Once `dev` has been reviewed and people feel it's time to release, we follow the git-flow release process, which creates a new tag and bumps the version correctly.  See sem-ver for versioning strategy.
 
 Every commit is tested by travis.  We encourage adding tests to validate your design.  We encourage discussing your use cases to help everyone get a better understanding of your design.
->>>>>>> master
 
 ## Other Dev Tips
 
@@ -177,8 +145,10 @@ Also if you can't code, it's possible to contribute by improving the documentati
 [@apanasef]: https://github.com/apanasef
 [@bewest]: https://github.com/bewest
 [@danamlewis]: https://github.com/danamlewis
+[@diabetlum]: https://github.com/diabetlum
 [@herzogmedia]: https://github.com/herzogmedia
 [@jamieowendexcom ]: https://github.com/jamieowendexcom 
+[@janrpn]: https://github.com/janrpn
 [@jasoncalabrese]: https://github.com/jasoncalabrese 
 [@jizhongwen]: https://github.com/jizhongwen
 [@jpcunningh]: https://github.com/jpcunningh
@@ -197,6 +167,7 @@ Also if you can't code, it's possible to contribute by improving the documentati
 [@tynbendad]: https://github.com/tynbendad
 [@unsoluble]: https://github.com/unsoluble
 [@viderehh]: https://github.com/viderehh
+[@OpossumGit]: https://github.com/OpossumGit
 
 | Contribution area                     | List of contributors |
 | ------------------------------------- | ---------------------------------- |
@@ -255,14 +226,14 @@ Languages with less than 90% coverage will be removed in a future Nightscout ver
 | Български (`bg`) |Please volunteer| OK |
 | Čeština (`cs`) |Please volunteer|OK |
 | Deutsch (`de`) |[@viderehh] [@herzogmedia] |OK |
-| Dansk (`dk`) |Please volunteer|OK |
+| Dansk (`dk`)  | [@janrpn] |OK |
 | Ελληνικά `(el`)|Please volunteer|Needs attention: 68.5%|
 | English (`en`)|Please volunteer|OK|
 | Español (`es`) |Please volunteer|OK|
 | Suomi (`fi`)|[@sulkaharo] |OK|
 | Français (`fr`)|Please volunteer|OK|
 | עברית (`he`)|Please volunteer|OK|
-| Hrvatski (`hr`)|Please volunteer|Needs attention: 47.8%|
+| Hrvatski (`hr`)|[@OpossumGit]|Needs attention: 47.8% - committed 100% to dev|
 | Italiano (`it`)|Please volunteer|OK|
 | 日本語 (`ja`)|[@LuminaryXion]|Working on this|
 | 한국어 (`ko`)|Please volunteer|Needs attention: 80.6%|
@@ -274,6 +245,7 @@ Languages with less than 90% coverage will be removed in a future Nightscout ver
 | Русский (`ru`)|[@apanasef]|OK|
 | Slovenčina (`sk`)|Please volunteer|OK|
 | Svenska (`sv`)|Please volunteer|OK|
+| Türkçe (`tr`)|[@diabetlum]|OK|
 | 中文（简体） (`zh_cn`) | [@jizhongwen]|OK|
 | 中文（繁體） (`zh_tw`) | [@jizhongwen]|Needs attention: 25.0%
 | 日本語 (`ja_jp`) | [@LuminaryXion]|
@@ -284,5 +256,5 @@ Languages with less than 90% coverage will be removed in a future Nightscout ver
 | ------------------------------------- | -------------------- |
 | All active developers: | [@jasoncalabrese] [@jpcunningh] [@jweismann] [@komarserjio] [@mdomox] [@MilosKozak] [@PieterGit] [@rickfriele] [@sulkaharo]
 | All active testers/documentors: | [@danamlewis] [@jamieowendexcom] [@mcdafydd] [@oteroos] [@rarneson] [@tynbendad] [@unsoluble]
-| All active translators: | [@apanasef] [@jizhongwen] [@viderehh] [@herzogmedia] [@LuminaryXion]
+| All active translators: | [@apanasef] [@jizhongwen] [@viderehh] [@herzogmedia] [@LuminaryXion] [@OpossumGit]
 
diff --git a/Dockerfile.example b/Dockerfile.example
@@ -1,17 +1,17 @@
-FROM node:8.9.1
+FROM node:10-alpine
 
 MAINTAINER Nightscout Contributors
 
-RUN apt-get update && \
-  apt-get -y dist-upgrade
-
 RUN mkdir -p /opt/app
 ADD . /opt/app
 WORKDIR /opt/app
+RUN chown -R node:node /opt/app
+USER node
 
 RUN npm install && \
   npm run postinstall && \
-  npm run env
+  npm run env && \
+  npm audit fix
 
 EXPOSE 1337