Skip to content

Commit c9fe11e

Browse files
author
Robert Wild
committed
Merge branch 'master' of github.com:nightscout/cgm-remote-monitor
* 'master' of github.com:nightscout/cgm-remote-monitor: (284 commits) Update config.yml Delete --individual-troubleshooting-help.md Create config.yml Update README.md Make empty cache detection a bit more aggressive to account for cache flush and data insert happening concurrently Support uploading device statuses in batches (nightscout#6147) Bump version to 14.0.6 Fix MONGODB_URI reference in error message Add error cat to error page Fix memory leak and cache update issues in 14.0.4 (nightscout#6133) Update --individual-troubleshooting-help.md Update --bug-report.md Update --feature-request--.md Remove require statement breaking deploys Fix tests Add file missing from last commit Less intimidating error page on start, which also checks for api_secret Don't report an error on every reconnect * Fix security test * Change boot and caching to expose Mongo connection errors Make settings parsing whitespace tolerant ... # Conflicts: # app.json
2 parents 1119a83 + bc55b07 commit c9fe11e

File tree

236 files changed

+21924
-8058
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

236 files changed

+21924
-8058
lines changed

.eslintrc.js

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,15 @@ module.exports = {
99
"commonjs": true,
1010
"es6": true,
1111
"node": true,
12+
"mocha": true,
1213
"jquery": true
14+
},
15+
"rules": {
16+
"no-unused-vars": [
17+
"error",
18+
{
19+
"varsIgnorePattern": "should|expect"
20+
}
21+
]
1322
}
1423
};

.github/ISSUE_TEMPLATE/--bug-report.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,10 @@ label: bug
55

66
---
77

8+
**If you need support for Nightscout, PLEASE DO NOT FILE A TICKET HERE**
9+
For support, please post a question to the "CGM in The Cloud" group in Facebook
10+
(https://www.facebook.com/groups/cgminthecloud) or visit the WeAreNotWaiting Discord at https://discord.gg/zg7CvCQ
11+
812
**Describe the bug**
913
A clear and concise description of what the bug is.
1014

.github/ISSUE_TEMPLATE/--feature-request--.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ about: Suggest an idea for this project
44

55
---
66

7+
**If you need support for Nightscout, PLEASE DO NOT FILE A TICKET HERE**
8+
For support, please post a question to the "CGM in The Cloud" group in Facebook
9+
(https://www.facebook.com/groups/cgminthecloud) or visit the WeAreNotWaiting Discord at https://discord.gg/zg7CvCQ
10+
711
**Is your feature request related to a problem? Please describe.**
812
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
913

.github/ISSUE_TEMPLATE/--individual-troubleshooting-help.md

Lines changed: 0 additions & 16 deletions
This file was deleted.

.github/ISSUE_TEMPLATE/config.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
blank_issues_enabled: false
2+
contact_links:
3+
- name: Troubleshooting Documentation
4+
url: http://nightscout.github.io/troubleshoot/troublehoot/
5+
about: Having trouble with Nightscout? Please check our step by step troubleshooting instructions.
6+
- name: Nightscout Community Support in Facebook
7+
url: https://www.facebook.com/groups/cgminthecloud
8+
about: If you're a Nightscout user and have trouble with your site, please post questions here. We don't have the resources to answer support questions posted here as tickets.
9+
- name: Nightscout Community Support in Discord
10+
url: https://discord.gg/zg7CvCQ
11+
about: If you're a Nightscout user and have trouble with your site, please post questions here. We don't have the resources to answer support questions posted here as tickets.

.github/workflows/main.yml

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
name: CI test
2+
3+
on: [push, pull_request]
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-16.04
9+
10+
strategy:
11+
matrix:
12+
node-version: [12.x]
13+
14+
steps:
15+
- uses: actions/checkout@v1
16+
- name: Use Node.js ${{ matrix.node-version }}
17+
uses: actions/setup-node@v1
18+
with:
19+
node-version: ${{ matrix.node-version }}
20+
- name: Install dependencies
21+
run: npm install
22+
- name: Install MongoDB
23+
run: |
24+
wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | sudo apt-key add -
25+
echo "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/4.4 multiverse" | sudo tee /etc/apt/sources.list.d/mongodb-org-4.4.list
26+
sudo apt-get update
27+
sudo apt-get install -y mongodb-org
28+
sudo apt-get install -y --allow-downgrades mongodb-org=4.4.0 mongodb-org-server=4.4.0 mongodb-org-shell=4.4.0 mongodb-org-mongos=4.4.0 mongodb-org-tools=4.4.0
29+
- name: Start MongoDB
30+
run: sudo systemctl start mongod
31+
- name: Run Tests
32+
run: npm run-script test-ci
33+
- name: Send Coverage
34+
run: npm run-script coverage

.gitignore

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ bundle/bundle.out.js
88
.idea/
99
*.iml
1010
my.env
11+
my.*.env
1112

12-
*.env
1313
static/bower_components/
1414
.*.sw?
1515
.DS_Store
@@ -24,3 +24,9 @@ npm-debug.log
2424
*.heapsnapshot
2525

2626
/tmp
27+
/.vs
28+
/cgm-remote-monitor.njsproj
29+
/cgm-remote-monitor.sln
30+
/obj/Debug
31+
/bin
32+
/*.bat

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@ matrix:
2424
allow_failures:
2525
node_js: "node"
2626
include:
27-
- node_js: "8"
28-
<<: *node_js-steps
2927
- node_js: "10"
3028
<<: *node_js-steps
31-
- node_js: "node" # Latest Node is not supported, and recommend, but we'll test it to know incompatibility issues
29+
- node_js: "12" # Latest Node is not supported, and recommend, but we'll test it to know incompatibility issues
3230
<<: *node_js-steps

0 commit comments

Comments
 (0)