Merge branch 'master' into '30_year_normals'
# Conflicts: # to_mongo.py
No related branches found
No related tags found
Showing
- README.md 4 additions, 2 deletionsREADME.md
- gddController.js 68 additions, 7 deletionsgddController.js
- package-lock.json 2670 additions, 9 deletionspackage-lock.json
- package.json 3 additions, 1 deletionpackage.json
- preprocess.py 0 additions, 58 deletionspreprocess.py
- pull_data.py 162 additions, 0 deletionspull_data.py
- requirements.txt 2 additions, 1 deletionrequirements.txt
- routes.js 93 additions, 2 deletionsroutes.js
- server.js 38 additions, 4 deletionsserver.js
- to_mongo.py 21 additions, 5 deletionsto_mongo.py
This diff is collapsed.
... | ... | @@ -12,6 +12,8 @@ |
"body-parser": "^1.19.0", | ||
"express": "^4.17.1", | ||
"mongoose": "^5.11.15", | ||
"nodemon": "^2.0.7" | ||
"nodemon": "^2.0.7", | ||
"swagger-jsdoc": "5.0.1", | ||
"swagger-ui-express": "^4.1.6" | ||
} | ||
} |
preprocess.py
deleted
100644 → 0
pull_data.py
0 → 100644
Please register or sign in to comment