version upgrade

Author: Juozas

backend/Dockerfile

@@ -10,6 +10,7 @@ WORKDIR /backend
 RUN npm i -q && \
     npm run compile && \
     npm prune -q --production
+    npm install -g yarn \
 
 #migrate & run
 CMD ./node_modules/.bin/sequelize db:migrate && \

backend/package.json

@@ -11,22 +11,22 @@
   "author": "domas@producters.com",
   "license": "MIT",
   "dependencies": {
-    "body-parser": "^1.15.0",
-    "express": "^4.13.4",
-    "fs-extra": "^0.28.0",
+    "body-parser": "^1.17.1",
+    "express": "^4.15.2",
+    "fs-extra": "^2.1.2",
     "nconf": "^0.8.4",
-    "pg": "^4.5.3",
-    "pug": "^2.0.0-alpha6",
-    "sequelize": "^3.21.0",
-    "sequelize-cli": "^2.3.1",
-    "winston": "^2.2.0"
+    "pg": "^6.1.4",
+    "pug": "^2.0.0-beta11",
+    "sequelize": "^3.30.2",
+    "sequelize-cli": "^2.6.0",
+    "winston": "^2.3.1"
   },
   "devDependencies": {
-    "babel-cli": "^6.7.7",
-    "babel-preset-es2015": "^6.6.0",
-    "babel-preset-stage-2": "^6.5.0",
-    "babel-register": "^6.7.2",
-    "nightwatch": "^0.8.18",
-    "nodemon": "^1.9.1"
+    "babel-cli": "^6.24.0",
+    "babel-preset-es2015": "^6.24.0",
+    "babel-preset-stage-2": "^6.22.0",
+    "babel-register": "^6.24.0",
+    "nightwatch": "^0.9.13",
+    "nodemon": "^1.11.0"
   }
 }

bin/env.sh

@@ -1,5 +1,5 @@
 export DOCKER_CONFIG_PROD=${DOCKER_CONFIG_PROD:-docker-compose.production.yml}
-export DOCKER_CONFIG_DEV=${DOCKER_CONFIG_DEV:-docker-compose.override.yml}
+export DOCKER_CONFIG_DEV=${DOCKER_CONFIG_DEV:-docker-compose.development.yml}
 
 
 dcdev() {

docker-compose.db.yml

@@ -1,7 +1,7 @@
 version: '2'
 services:
     dbclient:
-        image: postgres:9.5
+        image: postgres:9.6
         depends_on:
             - db
         environment:

docker-compose.override.yml renamed to docker-compose.development.yml

@@ -4,15 +4,15 @@ services:
         ports:
             - "9432:5432" 
     frontend:
-        image: node:5.10
+        image: node:7.7
         working_dir: /frontend
         command: npm run develop
         volumes:
             - ./frontend:/frontend
         ports:
             - "3000:3000"
     backend:
-        image: node:5.10
+        image: node:7.7
         working_dir: /backend
         command: npm run develop
         volumes:

docker-compose.test.yml

@@ -10,7 +10,7 @@ services:
         ports: 
             - 5900:5900
     testserver:
-        image: node:5.10
+        image: node:7.7
         working_dir: /backend
         command: npm run test
         volumes:

docker-compose.yml

@@ -1,11 +1,11 @@
 version: '2'
 services:
     dbdata:
-        image: postgres:9.5
+        image: postgres:9.6
         command: "true"
 
     db:
-        image: postgres:9.5
+        image: postgres:9.6
         environment:
             POSTGRES_DB: ${POSTGRES_DB}
             POSTGRES_USER: ${POSTGRES_USER}

frontend/package.json

@@ -12,18 +12,18 @@
   "author": "domasx2@gmail.com",
   "license": "ISC",
   "dependencies": {
-    "classnames": "^2.2.4",
-    "elemental": "^0.5.14",
-    "react": "^15.0.1",
-    "react-addons-css-transition-group": "^15.0.1",
-    "react-dom": "^15.0.1",
-    "react-redux": "^4.4.2",
-    "react-router": "^2.1.0",
-    "react-router-redux": "^4.0.2",
-    "react-tap-event-plugin": "^1.0.0",
-    "redux": "^3.4.0",
-    "redux-api-middleware": "^1.0.1",
-    "redux-thunk": "^2.0.1"
+    "classnames": "^2.2.5",
+    "elemental": "^0.6.1",
+    "react": "^15.4.2",
+    "react-addons-css-transition-group": "^15.4.2",
+    "react-dom": "^15.4.2",
+    "react-redux": "^5.0.3",
+    "react-router": "^3.0.2",
+    "react-router-redux": "^4.0.8",
+    "react-tap-event-plugin": "^2.0.1",
+    "redux": "^3.6.0",
+    "redux-api-middleware": "^1.0.2",
+    "redux-thunk": "^2.2.0"
   },
   "devDependencies": {
     "assets-webpack-plugin": "^3.4.0",

frontend/src/js/containers/notes-container.js

@@ -45,7 +45,7 @@ class NotesContainer extends Component {
                     <p>No notes.</p>
                 }
                 <Form type="inline" onSubmit={this.createNote.bind(this)}>
-                    <FormField label="Text" html-for="text">
+                    <FormField label="Text" htmlFor="text">
                         <FormInput type="text" placeholder="Note text" value={this.state.new_note} onChange={this.userInput.bind(this)} />
                     </FormField>
                     <FormField>