merge

package.json

@@ -29,6 +29,7 @@
     "express": "^4.14.0",
     "file-loader": "^0.9.0",
     "jquery": "^3.1.1",
+    "jws": "^3.1.4",
     "pg": "^6.1.2",
     "pg-hstore": "^2.3.2",
     "radium": "^0.18.1",

src/client/app/components/projects/viewProject.jsx

@@ -29,6 +29,7 @@ class ViewProject extends Component {
   }
 
   addFeature(e) {
+    console.log(this.props);
     let newState;
     if(e.key === 'Enter') {
       e.preventDefault();
@@ -38,13 +39,14 @@ class ViewProject extends Component {
 
       axios.post('/addFeature', {
         featureName: e.target.value,
+        projectId: this.props.projectData.id,
       }).then((res) => {
         // GET FEATURES
       }).catch((error) => {
         console.log(error);
       })
 
-      this.props.getFeatures();
+      this.getFeatures();
 
       e.target.value = '';
     }

src/server/database.js

@@ -1,6 +1,6 @@
 const Sequelize = require('sequelize');
 
-const sequelize = new Sequelize('postgres://ebanrqqz:sE13dKoNZ3qr17M8SqoQYTg8-Tkqv_Ry@elmer.db.elephantsql.com:5432/ebanrqqz');
+const sequelize = new Sequelize('	postgres://wzixuzdg:iaWmxsKOVuXH0Qyd5cMysSvZSUXt8ZDM@elmer.db.elephantsql.com:5432/wzixuzdg');
 
 sequelize.authenticate().then(function() {
   console.log('Connected!');

src/server/models/MessageModel.js

@@ -3,15 +3,12 @@ const sequelize = require('./../database');
 
 const Messages = sequelize.define('messages', {
   author: {
-    type: Sequelize.String(1000),
+    type: Sequelize.STRING(1000),
     field: 'message_author',
   },
   message: {
-    type: Sequelize.String(1000),
-    field: 'message_message',
-  },
-}, {
-  freezeTableName: true
+    type: Sequelize.STRING(1000),
+  }
 });
 
 Messages.belongsTo(Projects);

src/server/models/ProjectModel.js

@@ -13,6 +13,9 @@ const Projects = sequelize.define('projects', {
   },
 });
 
+Projects.hasMany(Features);
+Features.belongsTo(Projects); // projectId to model
+
 sequelize.sync();
 
 module.exports = Projects;