Merge pull request #58 from urbanriskmap/dev

Merge dev into master

.babelrc

@@ -1,3 +1,4 @@
 {
-  "presets": [ "es2015", "stage-0" ]
+  "presets": [ "es2015", "stage-0" ],
+  "plugins": [ "istanbul" ]
 }

.ebextensions/nginx.config

@@ -0,0 +1,8 @@
+files:
+  "/etc/security/limits.conf":
+    content: |
+      *           soft    nofile          32144
+      *           hard    nofile          32144
+container_commands:
+    01-worker-connections:
+        command: "/bin/sed -i 's/worker_connections  1024/worker_connections  32144/g' /tmp/deployment/config/#etc#nginx#nginx.conf"

.gitignore

@@ -11,4 +11,4 @@
 /node_modules
 
 *.log
-package-lock.json
+jsdoc/

.travis.yml

@@ -1,14 +1,17 @@
-dist: precise
+dist: trusty
 language: node_js
 node_js:
-   - "6.10.0"
+   - "8.1.4"
 sudo: true
 
+notifications:
+  slack: miturbanrisklab:4y7wfdHde8dtfb00wTfNZfTA
+
 addons:
   postgresql: "9.5"
-#  apt:
-#    packages:
-#      - postgresql-9.5-postgis-2.3
+  apt:
+    packages:
+      - postgresql-9.5-postgis-2.3
 
 branches:
   only:
@@ -18,7 +21,7 @@ branches:
     - report-archive
 
 before_install:
-  - if [[ `npm -v` != 3* ]]; then ~/.nvm/versions/node/v4.1.1/bin/npm install -g npm@3.10.10; fi
+  - npm i -g npm@5.0.3
   - if [[ $TRAVIS_BRANCH != 'master' ]]; then BRANCH='dev'; else BRANCH='master'; fi;
   - export PGDATABASE=cognicity_server_testing ; git clone -b $BRANCH https://github.com/urbanriskmap/cognicity-schema.git urbanriskmap/cognicity-schema && cd urbanriskmap/cognicity-schema && bash build/run.sh && cd -
 

CHANGELOG.md

@@ -15,6 +15,11 @@ API Server for CogniCity
 * Added integration tests on Travis, including against cognicity-schema
 * Extended data format of cards data object to collect different types of data
 * Merged changes from Chennai deployment, for better deployment in new cities
-* Image upload changed to use AWS S3 signed links
 
 ### v3.0.2
+* Updated to use Node v8.1.4 with npm 5.0.3
+* Pushed image url assignment to server
+* Updated cards/ patch endpoint to stop potential overwriting of image url
+* Card IDs generated as UUID by Postgres
+* Added schema version to / endpoint
+* Image upload changed to use AWS S3 signed links

README.md

@@ -1,14 +1,11 @@
-## cognicity-server
-API Server for CogniCity
-
-[![Build Status](https://travis-ci.org/urbanriskmap/cognicity-server.svg?branch=master)](https://travis-ci.org/urbanriskmap/cognicity-server)
-
-[![Coverage Status](https://coveralls.io/repos/github/urbanriskmap/cognicity-server/badge.svg?branch=server-object-refactor)](https://coveralls.io/github/urbanriskmap/cognicity-server?branch=server-object-refactor)
+[![Build Status](https://travis-ci.org/urbanriskmap/cognicity-server.svg?branch=master)](https://travis-ci.org/urbanriskmap/cognicity-server) [![Coverage Status](https://coveralls.io/repos/github/urbanriskmap/cognicity-server/badge.svg?branch=server-object-refactor)](https://coveralls.io/github/urbanriskmap/cognicity-server?branch=server-object-refactor)
 
 DOI for current stable release [v3.0.1](https://github.com/urbanriskmap/cognicity-server/releases/tag/v3.0.1)
 
 
 [![DOI](https://zenodo.org/badge/73803254.svg)](https://zenodo.org/badge/latestdoi/73803254)
+## cognicity-server
+API Server for CogniCity
 
 ### Summary
 
@@ -118,6 +115,8 @@ in the  jsdoc/ folder. To build documentation do:
 npm run jsdoc
 ```
 
+Docs are hosted at https://urbanriskmap.github.io/cognicity-server/jsdoc/
+
 ### Package management
 Before deployment:
 * Use NVM to switch to node and NPM versions specified in package.json for production